2056 files changed, 3295 insertions, 1635 deletions

diff --git a/bibtex/bst/context/cont-ab.bst b/bibtex/bst/context/mkii/cont-ab.bst
index e09da7ca5..e09da7ca5 100644
--- a/bibtex/bst/context/cont-ab.bst
+++ b/bibtex/bst/context/mkii/cont-ab.bst
diff --git a/bibtex/bst/context/cont-au.bst b/bibtex/bst/context/mkii/cont-au.bst
index d0b87186c..d0b87186c 100644
--- a/bibtex/bst/context/cont-au.bst
+++ b/bibtex/bst/context/mkii/cont-au.bst
diff --git a/bibtex/bst/context/cont-no.bst b/bibtex/bst/context/mkii/cont-no.bst
index 393d13db8..393d13db8 100644
--- a/bibtex/bst/context/cont-no.bst
+++ b/bibtex/bst/context/mkii/cont-no.bst
diff --git a/bibtex/bst/context/cont-ti.bst b/bibtex/bst/context/mkii/cont-ti.bst
index 34175a0ba..34175a0ba 100644
--- a/bibtex/bst/context/cont-ti.bst
+++ b/bibtex/bst/context/mkii/cont-ti.bst
diff --git a/context/data/scite/context/lexers/data/scite-context-data-tex.lua b/context/data/scite/context/lexers/data/scite-context-data-tex.lua
index 8dfb706e7..001dc1acb 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-tex.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-tex.lua
@@ -3,7 +3,7 @@ return {
  ["etex"]={ "botmarks", "clubpenalties", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "detokenize", "dimexpr", "displaywidowpenalties", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "everyeof", "firstmarks", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "ifcsname", "ifdefined", "iffontchar", "interactionmode", "interlinepenalties", "lastlinefit", "lastnodetype", "marks", "muexpr", "mutoglue", "numexpr", "pagediscards", "parshapedimen", "parshapeindent", "parshapelength", "predisplaydirection", "protected", "readline", "savinghyphcodes", "savingvdiscards", "scantokens", "showgroups", "showifs", "showtokens", "splitbotmarks", "splitdiscards", "splitfirstmarks", "topmarks", "tracingassigns", "tracinggroups", "tracingifs", "tracingnesting", "tracingscantokens", "unexpanded", "unless", "widowpenalties" },
  ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Uleft", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathcodenumdef", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Umiddle", "Uoverdelimiter", "Uradical", "Uright", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "bodydir", "boxdir", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "hjcode", "fontid", "formatname", "gleaders", "hyphenationmin", "ifabsdim", "ifabsnum", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luatexbanner", "luatexrevision", "luatexversion", "luafunction", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathoption", "mathscriptsmode", "mathstyle", "mathsurroundskip", "nokerns", "nohrule", "noligs", "nospaces", "novrule", "normaldeviate", "outputbox", "outputmode", "pagedir", "pageheight", "pagebottomoffset", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "preexhyphenchar", "prehyphenchar", "primitive", "protrudechars", "pxdimen", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressoutererror", "suppressmathparerror", "synctex", "tagcode", "textdir", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource", "vpack", "hpack", "tpack", "csstring", "begincsname", "lastnamedcs", "toksapp", "tokspre", "etoksapp", "etokspre" },
  ["omega"]={ "OmegaVersion", "bodydir", "chardp", "charht", "charit", "charwd", "leftghost", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "mathdir", "odelcode", "odelimiter", "omathaccent", "omathchar", "omathchardef", "omathcode", "oradical", "pagedir", "pageheight", "pagewidth", "pardir", "rightghost", "textdir" },
- ["pdftex"]={ "efcode", "expanded", "ifincsname", "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "leftmarginkern", "letterspacefont", "lpcode", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlineheight", "pdfeachlinedepth", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformname", "pdfxformresources", "pdfximage", "quitvmode", "rightmarginkern", "rpcode", "tagcode" },
- ["tex"]={ "-", "/", "AlephVersion", "Alephminorversion", "Alephrevision", "Alephversion", "OmegaVersion", "Omegaminorversion", "Omegarevision", "Omegaversion", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Uleft", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathcodenumdef", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Umiddle", "Uoverdelimiter", "Uradical", "Uright", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "alignmark", "aligntab", "atop", "atopwithdelims", "attribute", "attributedef", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "bodydir", "botmark", "botmarks", "boundary", "box", "boxdir", "boxmaxdepth", "brokenpenalty", "catcode", "catcodetable", "char", "chardef", "cleaders", "clearmarks", "closein", "closeout", "clubpenalties", "clubpenalty", "copy", "copyfont", "count", "countdef", "cr", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "crcr", "csname", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "detokenize", "dimen", "dimendef", "dimexpr", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalties", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "dviextension", "dvifeedback", "dvivariable", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "edef", "efcode", "hjcode", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyeof", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "expanded", "expandglyphsinfont", "fam", "fi", "finalhyphendemerits", "firstmark", "firstmarks", "floatingpenalty", "font", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "fontdimen", "fontid", "fontname", "formatname", "futurelet", "gdef", "gleaders", "global", "globaldefs", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifabsdim", "ifabsnum", "ifcase", "ifcat", "ifcsname", "ifdefined", "ifdim", "ifeof", "iffalse", "iffontchar", "ifhbox", "ifhmode", "ifincsname", "ifinner", "ifmmode", "ifnum", "ifodd", "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "ifprimitive", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignoreligaturesinfont", "ignorespaces", "immediate", "indent", "initcatcodetable", "input", "inputlineno", "insert", "insertpenalties", "interactionmode", "interlinepenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastlinefit", "lastnodetype", "lastpenalty", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastskip", "lastxpos", "lastypos", "latelua", "lccode", "leaders", "left", "leftghost", "lefthyphenmin", "leftmarginkern", "leftskip", "leqno", "let", "letcharcode", "letterspacefont", "limits", "linepenalty", "lineskip", "lineskiplimit", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "long", "looseness", "lower", "lowercase", "lpcode", "luaescapestring", "luatexbanner", "luatexrevision", "luatexversion", "mag", "mark", "marks", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathinner", "mathop", "mathopen", "mathoption", "mathord", "mathpunct", "mathrel", "mathscriptsmode", "mathstyle", "mathsurroundskip", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "muexpr", "multiply", "muskip", "muskipdef", "mutoglue", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nokerns", "nohrule", "noligs", "nospaces", "novrule", "nolimits", "nolocaldirs", "nolocalwhatsits", "nonscript", "nonstopmode", "normaldeviate", "nulldelimiterspace", "nullfont", "number", "numexpr", "odelcode", "odelimiter", "omathaccent", "omathchar", "omathchardef", "omathcode", "omit", "openin", "openout", "or", "oradical", "outer", "output", "outputbox", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagebottomoffset", "pagedepth", "pagedir", "pagediscards", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageheight", "pageleftoffset", "pagerightoffset", "pageshrink", "pagestretch", "pagetopoffset", "pagetotal", "pagewidth", "par", "pardir", "parfillskip", "parindent", "parshape", "parshapedimen", "parshapeindent", "parshapelength", "parskip", "patterns", "pausing", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlineheight", "pdfeachlinedepth", "pdfendlink", "pdfendthread", "pdfextension", "pdfvariable", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformname", "pdfxformresources", "pdfximage", "penalty", "postdisplaypenalty", "postexhyphenchar", "posthyphenchar", "predisplaydirection", "predisplaypenalty", "predisplaysize", "preexhyphenchar", "prehyphenchar", "pretolerance", "prevdepth", "prevgraf", "primitive", "protected", "pxdimen", "quitvmode", "radical", "raise", "randomseed", "read", "readline", "relax", "relpenalty", "right", "rightghost", "righthyphenmin", "rightmarginkern", "rightskip", "romannumeral", "rpcode", "saveboxresource", "saveimageresource", "savepos", "savecatcodetable", "savinghyphcodes", "savingvdiscards", "scantextokens", "scantokens", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setfontid", "setlanguage", "setrandomseed", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showgroups", "showifs", "showlists", "showthe", "showtokens", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitbotmarks", "splitdiscards", "splitfirstmark", "splitfirstmarks", "splitmaxdepth", "splittopskip", "string", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressoutererror", "synctex", "tabskip", "tagcode", "textdir", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topmarks", "topskip", "tracingassigns", "tracingcommands", "tracingfonts", "tracinggroups", "tracingifs", "tracinglostchars", "tracingmacros", "tracingnesting", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingscantokens", "tracingstats", "uccode", "uchyph", "underline", "unexpanded", "unhbox", "unhcopy", "uniformdeviate", "unkern", "unless", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "useboxresource", "useimageresource", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalties", "widowpenalty", "write", "xdef", "xleaders", "xspaceskip", "year", "vpack", "hpack", "tpack", "csstring", "begincsname", "lastnamedcs", "toksapp", "tokspre", "etoksapp", "etokspre" },
+ ["pdftex"]={ "efcode", "expanded", "ifincsname", "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "leftmarginkern", "letterspacefont", "lpcode", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlineheight", "pdfeachlinedepth", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfxformmargin", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformname", "pdfxformresources", "pdfximage", "quitvmode", "rightmarginkern", "rpcode", "tagcode" },
+ ["tex"]={ "-", "/", "AlephVersion", "Alephminorversion", "Alephrevision", "Alephversion", "OmegaVersion", "Omegaminorversion", "Omegarevision", "Omegaversion", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Uleft", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathcodenumdef", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Umiddle", "Uoverdelimiter", "Uradical", "Uright", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "alignmark", "aligntab", "atop", "atopwithdelims", "attribute", "attributedef", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "bodydir", "botmark", "botmarks", "boundary", "box", "boxdir", "boxmaxdepth", "brokenpenalty", "catcode", "catcodetable", "char", "chardef", "cleaders", "clearmarks", "closein", "closeout", "clubpenalties", "clubpenalty", "copy", "copyfont", "count", "countdef", "cr", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "crcr", "csname", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "detokenize", "dimen", "dimendef", "dimexpr", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalties", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "dviextension", "dvifeedback", "dvivariable", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "edef", "efcode", "hjcode", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyeof", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "expanded", "expandglyphsinfont", "fam", "fi", "finalhyphendemerits", "firstmark", "firstmarks", "floatingpenalty", "font", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "fontdimen", "fontid", "fontname", "formatname", "futurelet", "gdef", "gleaders", "global", "globaldefs", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifabsdim", "ifabsnum", "ifcase", "ifcat", "ifcsname", "ifdefined", "ifdim", "ifeof", "iffalse", "iffontchar", "ifhbox", "ifhmode", "ifincsname", "ifinner", "ifmmode", "ifnum", "ifodd", "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "ifprimitive", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignoreligaturesinfont", "ignorespaces", "immediate", "indent", "initcatcodetable", "input", "inputlineno", "insert", "insertpenalties", "interactionmode", "interlinepenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastlinefit", "lastnodetype", "lastpenalty", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastskip", "lastxpos", "lastypos", "latelua", "lccode", "leaders", "left", "leftghost", "lefthyphenmin", "leftmarginkern", "leftskip", "leqno", "let", "letcharcode", "letterspacefont", "limits", "linepenalty", "lineskip", "lineskiplimit", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "long", "looseness", "lower", "lowercase", "lpcode", "luaescapestring", "luatexbanner", "luatexrevision", "luatexversion", "mag", "mark", "marks", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathinner", "mathop", "mathopen", "mathoption", "mathord", "mathpunct", "mathrel", "mathscriptsmode", "mathstyle", "mathsurroundskip", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "muexpr", "multiply", "muskip", "muskipdef", "mutoglue", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nokerns", "nohrule", "noligs", "nospaces", "novrule", "nolimits", "nolocaldirs", "nolocalwhatsits", "nonscript", "nonstopmode", "normaldeviate", "nulldelimiterspace", "nullfont", "number", "numexpr", "odelcode", "odelimiter", "omathaccent", "omathchar", "omathchardef", "omathcode", "omit", "openin", "openout", "or", "oradical", "outer", "output", "outputbox", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagebottomoffset", "pagedepth", "pagedir", "pagediscards", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageheight", "pageleftoffset", "pagerightoffset", "pageshrink", "pagestretch", "pagetopoffset", "pagetotal", "pagewidth", "par", "pardir", "parfillskip", "parindent", "parshape", "parshapedimen", "parshapeindent", "parshapelength", "parskip", "patterns", "pausing", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlineheight", "pdfeachlinedepth", "pdfendlink", "pdfendthread", "pdfextension", "pdfvariable", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfxformmargin", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformname", "pdfxformresources", "pdfximage", "penalty", "postdisplaypenalty", "postexhyphenchar", "posthyphenchar", "predisplaydirection", "predisplaypenalty", "predisplaysize", "preexhyphenchar", "prehyphenchar", "pretolerance", "prevdepth", "prevgraf", "primitive", "protected", "pxdimen", "quitvmode", "radical", "raise", "randomseed", "read", "readline", "relax", "relpenalty", "right", "rightghost", "righthyphenmin", "rightmarginkern", "rightskip", "romannumeral", "rpcode", "saveboxresource", "saveimageresource", "savepos", "savecatcodetable", "savinghyphcodes", "savingvdiscards", "scantextokens", "scantokens", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setfontid", "setlanguage", "setrandomseed", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showgroups", "showifs", "showlists", "showthe", "showtokens", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitbotmarks", "splitdiscards", "splitfirstmark", "splitfirstmarks", "splitmaxdepth", "splittopskip", "string", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressoutererror", "synctex", "tabskip", "tagcode", "textdir", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topmarks", "topskip", "tracingassigns", "tracingcommands", "tracingfonts", "tracinggroups", "tracingifs", "tracinglostchars", "tracingmacros", "tracingnesting", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingscantokens", "tracingstats", "uccode", "uchyph", "underline", "unexpanded", "unhbox", "unhcopy", "uniformdeviate", "unkern", "unless", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "useboxresource", "useimageresource", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalties", "widowpenalty", "write", "xdef", "xleaders", "xspaceskip", "year", "vpack", "hpack", "tpack", "csstring", "begincsname", "lastnamedcs", "toksapp", "tokspre", "etoksapp", "etokspre" },
  ["xetex"]={ "XeTeXversion" },
 }
\ No newline at end of file
diff --git a/context/data/scite/context/scite-context-data-tex.properties b/context/data/scite/context/scite-context-data-tex.properties
index 73f48171c..ea6257e8c 100644
--- a/context/data/scite/context/scite-context-data-tex.properties
+++ b/context/data/scite/context/scite-context-data-tex.properties
@@ -88,23 +88,23 @@ pdfadjustspacing pdfannot pdfcatalog pdfcolorstack pdfcolorstackinit \
 pdfcompresslevel pdfcopyfont pdfcreationdate pdfdecimaldigits pdfdest \
 pdfdestmargin pdfdraftmode pdfeachlineheight pdfeachlinedepth pdfendlink \
 pdfendthread pdffirstlineheight pdffontattr pdffontexpand pdffontname \
-pdffontobjnum pdffontsize pdfgamma pdfgentounicode pdfglyphtounicode \
-pdfhorigin pdfignoreddimen pdfimageapplygamma pdfimagegamma pdfimagehicolor \
-pdfimageresolution pdfincludechars pdfinclusioncopyfonts pdfinclusionerrorlevel pdfinfo \
-pdfinsertht pdflastannot pdflastlinedepth pdflastlink pdflastobj \
-pdflastxform pdflastximage pdflastximagepages pdflastxpos pdflastypos \
-pdflinkmargin pdfliteral pdfmapfile pdfmapline pdfminorversion \
-pdfnames pdfnoligatures pdfnormaldeviate pdfobj pdfobjcompresslevel \
-pdfoutline pdfoutput pdfpageattr pdfpagebox pdfpageheight \
-pdfpageref pdfpageresources pdfpagesattr pdfpagewidth pdfpkmode \
-pdfpkresolution pdfprimitive pdfprotrudechars pdfpxdimen pdfrandomseed \
-pdfrefobj pdfrefxform pdfrefximage pdfreplacefont pdfrestore \
-pdfretval pdfsave pdfsavepos pdfsetmatrix pdfsetrandomseed \
-pdfstartlink pdfstartthread pdftexbanner pdftexrevision pdftexversion \
-pdfthread pdfthreadmargin pdftracingfonts pdftrailer pdfuniformdeviate \
-pdfuniqueresname pdfvorigin pdfxform pdfxformattr pdfxformname \
-pdfxformresources pdfximage quitvmode rightmarginkern rpcode \
-tagcode 
+pdffontobjnum pdffontsize pdfxformmargin pdfgamma pdfgentounicode \
+pdfglyphtounicode pdfhorigin pdfignoreddimen pdfimageapplygamma pdfimagegamma \
+pdfimagehicolor pdfimageresolution pdfincludechars pdfinclusioncopyfonts pdfinclusionerrorlevel \
+pdfinfo pdfinsertht pdflastannot pdflastlinedepth pdflastlink \
+pdflastobj pdflastxform pdflastximage pdflastximagepages pdflastxpos \
+pdflastypos pdflinkmargin pdfliteral pdfmapfile pdfmapline \
+pdfminorversion pdfnames pdfnoligatures pdfnormaldeviate pdfobj \
+pdfobjcompresslevel pdfoutline pdfoutput pdfpageattr pdfpagebox \
+pdfpageheight pdfpageref pdfpageresources pdfpagesattr pdfpagewidth \
+pdfpkmode pdfpkresolution pdfprimitive pdfprotrudechars pdfpxdimen \
+pdfrandomseed pdfrefobj pdfrefxform pdfrefximage pdfreplacefont \
+pdfrestore pdfretval pdfsave pdfsavepos pdfsetmatrix \
+pdfsetrandomseed pdfstartlink pdfstartthread pdftexbanner pdftexrevision \
+pdftexversion pdfthread pdfthreadmargin pdftracingfonts pdftrailer \
+pdfuniformdeviate pdfuniqueresname pdfvorigin pdfxform pdfxformattr \
+pdfxformname pdfxformresources pdfximage quitvmode rightmarginkern \
+rpcode tagcode 
 
 keywordclass.tex.tex=\
 - / AlephVersion Alephminorversion \
@@ -213,53 +213,54 @@ pdfcolorstackinit pdfcompresslevel pdfcopyfont pdfcreationdate pdfdecimaldigits
 pdfdest pdfdestmargin pdfdraftmode pdfeachlineheight pdfeachlinedepth \
 pdfendlink pdfendthread pdfextension pdfvariable pdffirstlineheight \
 pdffontattr pdffontexpand pdffontname pdffontobjnum pdffontsize \
-pdfgamma pdfgentounicode pdfglyphtounicode pdfhorigin pdfignoreddimen \
-pdfimageaddfilename pdfimageapplygamma pdfimagegamma pdfimagehicolor pdfimageresolution \
-pdfincludechars pdfinclusioncopyfonts pdfinclusionerrorlevel pdfinfo pdfinsertht \
-pdflastannot pdflastlinedepth pdflastlink pdflastobj pdflastxform \
-pdflastximage pdflastximagepages pdflastxpos pdflastypos pdflinkmargin \
-pdfliteral pdfmapfile pdfmapline pdfminorversion pdfnames \
-pdfnoligatures pdfnormaldeviate pdfobj pdfobjcompresslevel pdfoutline \
-pdfoutput pdfpageattr pdfpagebox pdfpageheight pdfpageref \
-pdfpageresources pdfpagesattr pdfpagewidth pdfpkmode pdfpkresolution \
-pdfprimitive pdfprotrudechars pdfpxdimen pdfrandomseed pdfrefobj \
-pdfrefxform pdfrefximage pdfreplacefont pdfrestore pdfretval \
-pdfsave pdfsavepos pdfsetmatrix pdfsetrandomseed pdfstartlink \
-pdfstartthread pdftexbanner pdftexrevision pdftexversion pdfthread \
-pdfthreadmargin pdftracingfonts pdftrailer pdfuniformdeviate pdfuniqueresname \
-pdfvorigin pdfxform pdfxformattr pdfxformname pdfxformresources \
-pdfximage penalty postdisplaypenalty postexhyphenchar posthyphenchar \
-predisplaydirection predisplaypenalty predisplaysize preexhyphenchar prehyphenchar \
-pretolerance prevdepth prevgraf primitive protected \
-pxdimen quitvmode radical raise randomseed \
-read readline relax relpenalty right \
-rightghost righthyphenmin rightmarginkern rightskip romannumeral \
-rpcode saveboxresource saveimageresource savepos savecatcodetable \
-savinghyphcodes savingvdiscards scantextokens scantokens scriptfont \
-scriptscriptfont scriptscriptstyle scriptspace scriptstyle scrollmode \
-setbox setfontid setlanguage setrandomseed sfcode \
-shipout show showbox showboxbreadth showboxdepth \
-showgroups showifs showlists showthe showtokens \
-skewchar skip skipdef spacefactor spaceskip \
-span special splitbotmark splitbotmarks splitdiscards \
-splitfirstmark splitfirstmarks splitmaxdepth splittopskip string \
-suppressfontnotfounderror suppressifcsnameerror suppresslongerror suppressoutererror synctex \
-tabskip tagcode textdir textfont textstyle \
-the thickmuskip thinmuskip time toks \
-toksdef tolerance topmark topmarks topskip \
-tracingassigns tracingcommands tracingfonts tracinggroups tracingifs \
-tracinglostchars tracingmacros tracingnesting tracingonline tracingoutput \
-tracingpages tracingparagraphs tracingrestores tracingscantokens tracingstats \
-uccode uchyph underline unexpanded unhbox \
-unhcopy uniformdeviate unkern unless unpenalty \
-unskip unvbox unvcopy uppercase useboxresource \
-useimageresource vadjust valign vbadness vbox \
-vcenter vfil vfill vfilneg vfuzz \
-voffset vrule vsize vskip vsplit \
-vss vtop wd widowpenalties widowpenalty \
-write xdef xleaders xspaceskip year \
-vpack hpack tpack csstring begincsname \
-lastnamedcs toksapp tokspre etoksapp etokspre 
+pdfxformmargin pdfgamma pdfgentounicode pdfglyphtounicode pdfhorigin \
+pdfignoreddimen pdfimageaddfilename pdfimageapplygamma pdfimagegamma pdfimagehicolor \
+pdfimageresolution pdfincludechars pdfinclusioncopyfonts pdfinclusionerrorlevel pdfinfo \
+pdfinsertht pdflastannot pdflastlinedepth pdflastlink pdflastobj \
+pdflastxform pdflastximage pdflastximagepages pdflastxpos pdflastypos \
+pdflinkmargin pdfliteral pdfmapfile pdfmapline pdfminorversion \
+pdfnames pdfnoligatures pdfnormaldeviate pdfobj pdfobjcompresslevel \
+pdfoutline pdfoutput pdfpageattr pdfpagebox pdfpageheight \
+pdfpageref pdfpageresources pdfpagesattr pdfpagewidth pdfpkmode \
+pdfpkresolution pdfprimitive pdfprotrudechars pdfpxdimen pdfrandomseed \
+pdfrefobj pdfrefxform pdfrefximage pdfreplacefont pdfrestore \
+pdfretval pdfsave pdfsavepos pdfsetmatrix pdfsetrandomseed \
+pdfstartlink pdfstartthread pdftexbanner pdftexrevision pdftexversion \
+pdfthread pdfthreadmargin pdftracingfonts pdftrailer pdfuniformdeviate \
+pdfuniqueresname pdfvorigin pdfxform pdfxformattr pdfxformname \
+pdfxformresources pdfximage penalty postdisplaypenalty postexhyphenchar \
+posthyphenchar predisplaydirection predisplaypenalty predisplaysize preexhyphenchar \
+prehyphenchar pretolerance prevdepth prevgraf primitive \
+protected pxdimen quitvmode radical raise \
+randomseed read readline relax relpenalty \
+right rightghost righthyphenmin rightmarginkern rightskip \
+romannumeral rpcode saveboxresource saveimageresource savepos \
+savecatcodetable savinghyphcodes savingvdiscards scantextokens scantokens \
+scriptfont scriptscriptfont scriptscriptstyle scriptspace scriptstyle \
+scrollmode setbox setfontid setlanguage setrandomseed \
+sfcode shipout show showbox showboxbreadth \
+showboxdepth showgroups showifs showlists showthe \
+showtokens skewchar skip skipdef spacefactor \
+spaceskip span special splitbotmark splitbotmarks \
+splitdiscards splitfirstmark splitfirstmarks splitmaxdepth splittopskip \
+string suppressfontnotfounderror suppressifcsnameerror suppresslongerror suppressoutererror \
+synctex tabskip tagcode textdir textfont \
+textstyle the thickmuskip thinmuskip time \
+toks toksdef tolerance topmark topmarks \
+topskip tracingassigns tracingcommands tracingfonts tracinggroups \
+tracingifs tracinglostchars tracingmacros tracingnesting tracingonline \
+tracingoutput tracingpages tracingparagraphs tracingrestores tracingscantokens \
+tracingstats uccode uchyph underline unexpanded \
+unhbox unhcopy uniformdeviate unkern unless \
+unpenalty unskip unvbox unvcopy uppercase \
+useboxresource useimageresource vadjust valign vbadness \
+vbox vcenter vfil vfill vfilneg \
+vfuzz voffset vrule vsize vskip \
+vsplit vss vtop wd widowpenalties \
+widowpenalty write xdef xleaders xspaceskip \
+year vpack hpack tpack csstring \
+begincsname lastnamedcs toksapp tokspre etoksapp \
+etokspre 
 
 keywordclass.tex.xetex=\
 XeTeXversion 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-libraries.tex b/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
index d7f4bf63d..ec401c282 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-libraries.tex
@@ -4387,7 +4387,7 @@ and \type {pdf.retval}}
 These status variables are similar to the ones traditionally used at the \TEX\
 end.
 
-\subsection{\type {pdf.setorigin}}
+\subsection{\type {pdf.setorigin}, \type {pdf.getorigin}}
 
 This one is used to set the horizonal and/or vertical offset (a traditional
 backend property).
@@ -4398,6 +4398,16 @@ pdf.setorigin(tex.sp("1in")) -- sets both to 1in
 pdf.setorigin(tex.sp("1in"),tex.sp("1in"))
 \stoptyping
 
+The counterpart of this function returns two values.
+
+\subsection{\type {pdf.setlinkmargin}, \type {pdf.getlinkmargin} \type
+{pdf.setdestmargin}, \type {pdf.getdestmargin}} \type {pdf.setthreadmargin},
+\type {pdf.getthreadmargin} \type {pdf.setxformmargin}, \type
+{pdf.getxformmargin}}
+
+These function can be used to set and retrieve the margins that are added to the
+natural boundingboxes of the respective objects.
+
 \subsection{\type {pdf.h}, \type {pdf.v}}
 
 These are the \type {h} and \type {v} values that define the current location on
@@ -4987,6 +4997,15 @@ tex.year
 % tex.pdftracingfonts
 % tex.pdfuniqueresname
 
+% tex.pdfdestmargin
+% tex.pdflinkmargin
+% tex.pdfthreadmargin
+% tex.pdfxformmargin
+% tex.pdfhorigin
+% tex.pdfvorigin
+
+% tex.pdfpxdimen
+
 Read|-|only:
 
 \startthreecolumns
@@ -5030,14 +5049,6 @@ tex.pagerightoffset
 tex.pagetopoffset
 tex.pagewidth
 tex.parindent
-tex.pdfdestmargin
-tex.pdfhorigin
-tex.pdflinkmargin
-tex.pdfpageheight
-tex.pdfpagewidth
-tex.pdfpxdimen
-tex.pdfthreadmargin
-tex.pdfvorigin
 tex.predisplaysize
 tex.scriptspace
 tex.splitmaxdepth
@@ -5443,9 +5454,11 @@ called xforms in \PDF). You can (re)use the box with \type {\useboxresource} or
 by creating a rule node with subtype~2.
 
 \starttyping
-local index = tex.saveboxresource(n,attributes,resources)
+local index = tex.saveboxresource(n,attributes,resources,immediate)
 \stoptyping
 
+The optional second and third arguments are strings, the fourth is a boolean.
+
 You can generate the reference (a rule type) with:
 
 \starttyping
diff --git a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
index 7818ea5b4..940afc24b 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
@@ -553,6 +553,7 @@ The configuration related registers have become:
 \edef\pdflinkmargin               {\pdfvariable linkmargin}
 \edef\pdfdestmargin               {\pdfvariable destmargin}
 \edef\pdfthreadmargin             {\pdfvariable threadmargin}
+\edef\pdfformmargin               {\pdfvariable formmargin}
 
 \edef\pdfpagesattr                {\pdfvariable pagesattr}
 \edef\pdfpageattr                 {\pdfvariable pageattr}
@@ -606,6 +607,7 @@ the defaults; these are:
 \pdflinkmargin          0pt
 \pdfdestmargin          0pt
 \pdfthreadmargin        0pt
+\pdfxformmargin         0pt
 \stoptyping
 
 If you also want some backward compatibility, you can add:
diff --git a/metapost/context/base/metafun.mp b/metapost/context/base/common/metafun.mp
index ae0a6d6fd..ae0a6d6fd 100644
--- a/metapost/context/base/metafun.mp
+++ b/metapost/context/base/common/metafun.mp
diff --git a/metapost/context/base/common/mp-back.mp b/metapost/context/base/common/mp-back.mp
new file mode 100644
index 000000000..ecfb0c816
--- /dev/null
+++ b/metapost/context/base/common/mp-back.mp
@@ -0,0 +1,5 @@
+if known mplib :
+    input mp-back.mpiv
+else :
+    input mp-back.mpii
+fi ;
diff --git a/metapost/context/base/common/mp-fobg.mp b/metapost/context/base/common/mp-fobg.mp
new file mode 100644
index 000000000..b61ea4724
--- /dev/null
+++ b/metapost/context/base/common/mp-fobg.mp
@@ -0,0 +1,5 @@
+if known mplib :
+    input mp-fobg.mpiv
+else :
+    input mp-fobg.mpii
+fi ;
diff --git a/metapost/context/base/common/mp-symb.mp b/metapost/context/base/common/mp-symb.mp
new file mode 100644
index 000000000..b39ceaab7
--- /dev/null
+++ b/metapost/context/base/common/mp-symb.mp
@@ -0,0 +1,6 @@
+if known mplib :
+    input mp-symb.mpiv
+else :
+    input mp-symb.mpii
+fi ;
+
diff --git a/metapost/context/base/metafun.mpii b/metapost/context/base/mpii/metafun.mpii
index 9c55191f7..9c55191f7 100644
--- a/metapost/context/base/metafun.mpii
+++ b/metapost/context/base/mpii/metafun.mpii
diff --git a/metapost/context/base/mp-back.mp b/metapost/context/base/mpii/mp-back.mpii
index f588adea9..f588adea9 100644
--- a/metapost/context/base/mp-back.mp
+++ b/metapost/context/base/mpii/mp-back.mpii
diff --git a/metapost/context/base/mp-base.mpii b/metapost/context/base/mpii/mp-base.mpii
index 7af4bc436..7af4bc436 100644
--- a/metapost/context/base/mp-base.mpii
+++ b/metapost/context/base/mpii/mp-base.mpii
diff --git a/metapost/context/base/mp-butt.mpii b/metapost/context/base/mpii/mp-butt.mpii
index 107886bb5..107886bb5 100644
--- a/metapost/context/base/mp-butt.mpii
+++ b/metapost/context/base/mpii/mp-butt.mpii
diff --git a/metapost/context/base/mp-char.mpii b/metapost/context/base/mpii/mp-char.mpii
index 63a71eff8..63a71eff8 100644
--- a/metapost/context/base/mp-char.mpii
+++ b/metapost/context/base/mpii/mp-char.mpii
diff --git a/metapost/context/base/mp-core.mpii b/metapost/context/base/mpii/mp-core.mpii
index 33e9b386e..33e9b386e 100644
--- a/metapost/context/base/mp-core.mpii
+++ b/metapost/context/base/mpii/mp-core.mpii
diff --git a/metapost/context/base/mp-figs.mpii b/metapost/context/base/mpii/mp-figs.mpii
index d4fcc2b35..d4fcc2b35 100644
--- a/metapost/context/base/mp-figs.mpii
+++ b/metapost/context/base/mpii/mp-figs.mpii
diff --git a/metapost/context/base/mp-fobg.mp b/metapost/context/base/mpii/mp-fobg.mpii
index f8b709572..f8b709572 100644
--- a/metapost/context/base/mp-fobg.mp
+++ b/metapost/context/base/mpii/mp-fobg.mpii
diff --git a/metapost/context/base/mp-form.mpii b/metapost/context/base/mpii/mp-form.mpii
index d1dac32db..d1dac32db 100644
--- a/metapost/context/base/mp-form.mpii
+++ b/metapost/context/base/mpii/mp-form.mpii
diff --git a/metapost/context/base/mp-func.mpii b/metapost/context/base/mpii/mp-func.mpii
index 94e400b91..94e400b91 100644
--- a/metapost/context/base/mp-func.mpii
+++ b/metapost/context/base/mpii/mp-func.mpii
diff --git a/metapost/context/base/mp-grid.mpii b/metapost/context/base/mpii/mp-grid.mpii
index ea28d60af..ea28d60af 100644
--- a/metapost/context/base/mp-grid.mpii
+++ b/metapost/context/base/mpii/mp-grid.mpii
diff --git a/metapost/context/base/mp-grph.mpii b/metapost/context/base/mpii/mp-grph.mpii
index 782942946..782942946 100644
--- a/metapost/context/base/mp-grph.mpii
+++ b/metapost/context/base/mpii/mp-grph.mpii
diff --git a/metapost/context/base/mp-page.mpii b/metapost/context/base/mpii/mp-page.mpii
index 456ee61cc..456ee61cc 100644
--- a/metapost/context/base/mp-page.mpii
+++ b/metapost/context/base/mpii/mp-page.mpii
diff --git a/metapost/context/base/mp-shap.mpii b/metapost/context/base/mpii/mp-shap.mpii
index 17d21314c..17d21314c 100644
--- a/metapost/context/base/mp-shap.mpii
+++ b/metapost/context/base/mpii/mp-shap.mpii
diff --git a/metapost/context/base/mp-spec.mpii b/metapost/context/base/mpii/mp-spec.mpii
index 19d81f312..19d81f312 100644
--- a/metapost/context/base/mp-spec.mpii
+++ b/metapost/context/base/mpii/mp-spec.mpii
diff --git a/metapost/context/base/mp-step.mpii b/metapost/context/base/mpii/mp-step.mpii
index e05f00b6e..e05f00b6e 100644
--- a/metapost/context/base/mp-step.mpii
+++ b/metapost/context/base/mpii/mp-step.mpii
diff --git a/metapost/context/base/mp-text.mpii b/metapost/context/base/mpii/mp-text.mpii
index 5f96f6788..5f96f6788 100644
--- a/metapost/context/base/mp-text.mpii
+++ b/metapost/context/base/mpii/mp-text.mpii
diff --git a/metapost/context/base/mp-tool.mpii b/metapost/context/base/mpii/mp-tool.mpii
index a5bb345a1..a5bb345a1 100644
--- a/metapost/context/base/mp-tool.mpii
+++ b/metapost/context/base/mpii/mp-tool.mpii
diff --git a/metapost/context/base/mp-txts.mpii b/metapost/context/base/mpii/mp-txts.mpii
index d3597488f..d3597488f 100644
--- a/metapost/context/base/mp-txts.mpii
+++ b/metapost/context/base/mpii/mp-txts.mpii
diff --git a/metapost/context/base/metafun.mpiv b/metapost/context/base/mpiv/metafun.mpiv
index b1d4f32e7..b1d4f32e7 100644
--- a/metapost/context/base/metafun.mpiv
+++ b/metapost/context/base/mpiv/metafun.mpiv
diff --git a/metapost/context/base/mp-abck.mpiv b/metapost/context/base/mpiv/mp-abck.mpiv
index abd7d8848..abd7d8848 100644
--- a/metapost/context/base/mp-abck.mpiv
+++ b/metapost/context/base/mpiv/mp-abck.mpiv
diff --git a/metapost/context/base/mp-apos.mpiv b/metapost/context/base/mpiv/mp-apos.mpiv
index 7b7737754..7b7737754 100644
--- a/metapost/context/base/mp-apos.mpiv
+++ b/metapost/context/base/mpiv/mp-apos.mpiv
diff --git a/metapost/context/base/mp-asnc.mpiv b/metapost/context/base/mpiv/mp-asnc.mpiv
index 2626e4d58..2626e4d58 100644
--- a/metapost/context/base/mp-asnc.mpiv
+++ b/metapost/context/base/mpiv/mp-asnc.mpiv
diff --git a/metapost/context/base/mpiv/mp-back.mpiv b/metapost/context/base/mpiv/mp-back.mpiv
new file mode 100644
index 000000000..f588adea9
--- /dev/null
+++ b/metapost/context/base/mpiv/mp-back.mpiv
@@ -0,0 +1,205 @@
+%D \module
+%D   [       file=mp-back.mp,
+%D        version=2000.05.31,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=backgrounds,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if known context_back : endinput ; fi ;
+
+boolean context_back ; context_back := true ;
+
+def some_hash ( expr hash_width     ,
+                     hash_height    ,
+                     hash_linewidth ,
+                     hash_linecolor ,
+                     hash_angle     ,
+                     hash_gap       ) =
+
+  stripe_gap := hash_gap ;
+  stripe_angle := hash_angle ;
+  drawoptions (withpen pencircle scaled hash_linewidth
+               withcolor hash_linecolor) ;
+  path p ; p := unitsquare xscaled hash_width yscaled hash_height ;
+  stripe_path_a () (draw) p ;  % next we move it all to quadrant 1
+  currentpicture := currentpicture shifted urcorner currentpicture ;
+
+enddef ;
+
+def some_double_back (expr back_type        ,
+                           back_width       ,
+                           back_height      ,
+                           back_delta       ,
+                           back_linewidth   ,
+                           back_linecolor   ,
+                           back_fillcolor   ,
+                           back_topcolor    ,
+                           back_bottomcolor ,
+                           back_leftcolor   ,
+                           back_rightcolor  ) =
+
+  numeric ww ; ww := back_width  ;
+  numeric hh ; hh := back_height ;
+  numeric dd ; dd := back_delta  ;
+
+  color back_nillcolor ; back_nillcolor := back_topcolor ;
+
+  path p ; p := fullsquare xscaled  ww      yscaled  hh      ;
+  path q ; q := fullsquare xscaled (ww-2dd) yscaled (hh-2dd) ;
+  path r ; r := llcorner p --
+                lrcorner p shifted (-3dd,0) .. controls lrcorner p ..
+                lrcorner p shifted (0, 3dd) --
+                urcorner p shifted (0,-3dd) .. controls urcorner p ..
+                urcorner p shifted (-3dd,0) --
+                ulcorner p -- cycle ;
+  path s ; s := r xscaled ((ww-2dd)/ww) yscaled ((hh-2dd)/hh) ;
+  path t ; t := llcorner p --
+                lrcorner p --
+                urcorner p shifted (0,-3dd) .. controls urcorner p ..
+                urcorner p shifted (-3dd,0) --
+                ulcorner p shifted ( 3dd,0) .. controls ulcorner p ..
+                ulcorner p shifted (0,-3dd) --
+                llcorner p -- cycle ;
+  path u ; u := t xscaled ((ww-2dd)/ww) yscaled ((hh-2dd)/hh) ;
+  path v ; v := llcorner p shifted ( 3dd,0) --
+                lrcorner p shifted (-3dd,0) .. controls lrcorner p ..
+                lrcorner p shifted (0, 3dd) --
+                urcorner p shifted (0,-3dd) .. controls urcorner p ..
+                urcorner p shifted (-3dd,0) --
+                ulcorner p shifted ( 3dd,0) .. controls ulcorner p ..
+                ulcorner p shifted (0,-3dd) ..
+                llcorner p shifted (0, 3dd) .. controls llcorner p .. cycle ; % {down}  .. cycle ;
+  path w ; w := t xscaled ((ww-2dd)/ww) yscaled ((hh-2dd)/hh) ;
+  path a ; a := llcorner p -- ulcorner p --
+                ulcorner q -- llcorner q -- cycle ;
+  path b ; b := llcorner p -- lrcorner p --
+                lrcorner q -- llcorner q -- cycle ;
+  path c ; c := lrcorner p -- urcorner p --
+                urcorner q -- lrcorner q -- cycle ;
+  path d ; d := ulcorner p -- urcorner p --
+                urcorner q -- ulcorner q -- cycle ;
+  path e ; e := llcorner p -- lrcorner p --
+                urcorner p -- urcorner q --
+                lrcorner q -- llcorner q -- cycle ;
+  path f ; f := llcorner p -- ulcorner p --
+                urcorner p -- urcorner q --
+                ulcorner q -- llcorner q -- cycle ;
+
+  linecap := butt ; pickup pencircle scaled back_linewidth ;
+
+  if back_type=1 :
+
+    fill p withcolor back_fillcolor   ;
+    fill a withcolor back_leftcolor   ;
+    fill b withcolor back_bottomcolor ;
+    fill c withcolor back_rightcolor  ;
+    fill d withcolor back_topcolor    ;
+    draw a withcolor back_linecolor   ;
+    draw d withcolor back_linecolor   ;
+    draw b withcolor back_linecolor   ;
+    draw c withcolor back_linecolor   ;
+
+  elseif back_type=2 :
+
+    fill p withcolor back_fillcolor   ;
+    fill e withcolor back_bottomcolor ;
+    fill f withcolor back_topcolor    ;
+    draw e withcolor back_linecolor   ;
+    draw f withcolor back_linecolor   ;
+
+  elseif back_type=3 :
+
+    fill v withcolor back_nillcolor   ;
+    fill w withcolor back_fillcolor   ;
+    draw v withcolor back_linecolor   ;
+    draw w withcolor back_linecolor   ;
+
+  elseif back_type=4 :
+
+    fill t withcolor back_nillcolor   ;
+    fill u withcolor back_fillcolor   ;
+    draw t withcolor back_linecolor   ;
+    draw u withcolor back_linecolor   ;
+
+  elseif back_type=5 :
+
+    t := t rotatedaround(center t,180) ;
+    u := u rotatedaround(center u,180) ;
+
+    fill t withcolor back_nillcolor   ;
+    fill u withcolor back_fillcolor   ;
+    draw t withcolor back_linecolor   ;
+    draw u withcolor back_linecolor   ;
+
+  elseif back_type=6 :
+
+    r := r rotatedaround(center r,180) ;
+    s := s rotatedaround(center s,180) ;
+
+    fill r withcolor back_nillcolor   ;
+    fill s withcolor back_fillcolor   ;
+    draw r withcolor back_linecolor   ;
+    draw s withcolor back_linecolor   ;
+
+  elseif back_type=7 :
+
+    fill r withcolor back_nillcolor   ;
+    fill s withcolor back_fillcolor   ;
+    draw r withcolor back_linecolor   ;
+    draw s withcolor back_linecolor   ;
+
+fi ;
+
+enddef ;
+
+endinput ;
+
+beginfig (1) ;
+
+some_double_back (1, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, .6white, .7white, .6white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (2, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, .6white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (3, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (4, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (5, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (6, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (7, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+currentpicture := currentpicture shifted (0,-3cm) ;
+
+some_double_back (8, 4.5cm, 1.5cm, .25cm, 1mm,
+           .5white, .8white, .7white, white, white, white)
+
+endfig ;
+
+end .
diff --git a/metapost/context/base/mp-bare.mpiv b/metapost/context/base/mpiv/mp-bare.mpiv
index c6194b1ee..c6194b1ee 100644
--- a/metapost/context/base/mp-bare.mpiv
+++ b/metapost/context/base/mpiv/mp-bare.mpiv
diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mpiv/mp-base.mpiv
index 28eb57fb8..28eb57fb8 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mpiv/mp-base.mpiv
diff --git a/metapost/context/base/mp-butt.mpiv b/metapost/context/base/mpiv/mp-butt.mpiv
index 6f5b90a7e..6f5b90a7e 100644
--- a/metapost/context/base/mp-butt.mpiv
+++ b/metapost/context/base/mpiv/mp-butt.mpiv
diff --git a/metapost/context/base/mp-char.mpiv b/metapost/context/base/mpiv/mp-char.mpiv
index f604accd8..f604accd8 100644
--- a/metapost/context/base/mp-char.mpiv
+++ b/metapost/context/base/mpiv/mp-char.mpiv
diff --git a/metapost/context/base/mp-chem.mpiv b/metapost/context/base/mpiv/mp-chem.mpiv
index b861d3f12..b861d3f12 100644
--- a/metapost/context/base/mp-chem.mpiv
+++ b/metapost/context/base/mpiv/mp-chem.mpiv
diff --git a/metapost/context/base/mp-core.mpiv b/metapost/context/base/mpiv/mp-core.mpiv
index 9b7182908..9b7182908 100644
--- a/metapost/context/base/mp-core.mpiv
+++ b/metapost/context/base/mpiv/mp-core.mpiv
diff --git a/metapost/context/base/mp-cows.mpiv b/metapost/context/base/mpiv/mp-cows.mpiv
index 3ad1a98f5..3ad1a98f5 100644
--- a/metapost/context/base/mp-cows.mpiv
+++ b/metapost/context/base/mpiv/mp-cows.mpiv
diff --git a/metapost/context/base/mp-crop.mpiv b/metapost/context/base/mpiv/mp-crop.mpiv
index 00bcdcb44..00bcdcb44 100644
--- a/metapost/context/base/mp-crop.mpiv
+++ b/metapost/context/base/mpiv/mp-crop.mpiv
diff --git a/metapost/context/base/mp-figs.mpiv b/metapost/context/base/mpiv/mp-figs.mpiv
index aac7c5ad2..aac7c5ad2 100644
--- a/metapost/context/base/mp-figs.mpiv
+++ b/metapost/context/base/mpiv/mp-figs.mpiv
diff --git a/metapost/context/base/mpiv/mp-fobg.mpiv b/metapost/context/base/mpiv/mp-fobg.mpiv
new file mode 100644
index 000000000..f8b709572
--- /dev/null
+++ b/metapost/context/base/mpiv/mp-fobg.mpiv
@@ -0,0 +1,87 @@
+%D \module
+%D   [       file=mp-fobg.mp,
+%D        version=2004.03.12,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=Formatting Objects,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if known context_fobg : endinput ; fi ;
+
+boolean context_fobg ; context_fobg := true ;
+
+FoNone   := 0 ; FoHidden := 1 ; FoDotted := 2 ; FoDashed := 3 ; FoSolid  := 4 ;
+FoDouble := 5 ; FoGroove := 6 ; FoRidge  := 7 ; FoInset  := 8 ; FoOutset := 9 ;
+FoAll    := 0 ; FoTop    := 1 ; FoBottom := 2 ; FoLeft   := 3 ; FoRight  := 4 ;
+FoMedium := .5pt ; FoThin := FoMedium/2 ; FoThick := FoMedium*2 ;
+
+color FoBackgroundColor, FoNoColor, FoLineColor[] ; FoNoColor := (-1,-1,-1) ;
+numeric FoLineWidth[], FoLineStyle[] ;
+boolean FoFrame, FoBackground, FoSplit ;
+
+FoFrame := FoBackground := FoSplit := false ;
+FoBackgroundColor := white ;
+FoDashFactor := .5 ;
+FoDotFactor := .375 ;
+
+for i = FoAll upto FoRight :
+  FoLineColor[i] := black ;
+  FoLineWidth[i] := .5pt ;
+  FoLineStyle[i] := FoNone ;
+endfor ;
+
+def DrawFoFrame(expr n, p) =
+  drawoptions(withcolor FoLineColor[n] withpen pencircle scaled FoLineWidth[n]) ;
+  if     FoLineStyle[n] = FoNone   :
+    % nothing
+  elseif FoLineStyle[n] = FoHidden :
+    % nothing
+  elseif FoLineStyle[n] = FoDotted :
+    draw p dashed (withdots scaled (FoDotFactor*FoLineWidth[n])) ;
+  elseif FoLineStyle[n] = FoDashed :
+    draw p dashed (evenly scaled (FoDashFactor*FoLineWidth[n])) ;
+  elseif FoLineStyle[n] = FoSolid  :
+    draw p ;
+  elseif FoLineStyle[n] = FoDouble :
+    draw p enlarged  FoLineWidth[n] ; draw p enlarged -FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoGroove :
+    draw p ;
+    draw p withpen pencircle scaled .5FoLineWidth[n] withcolor (inverted FoLineColor[n] softened .5) ;
+  elseif FoLineStyle[n] = FoRidge  :
+    draw p withcolor  (inverted FoLineColor[n] softened .5) ;
+    draw p withpen pencircle scaled .5FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoInset  :
+    draw p ; draw p inset 2.5FoLineWidth[n] ;
+  elseif FoLineStyle[n] = FoOutset :
+    draw p ; draw p outset 2.5FoLineWidth[n] ;
+ fi ;
+enddef ;
+
+primarydef p outset d =
+  ((lrcorner p -- urcorner p -- ulcorner p -- llcorner p -- cycle)
+      shifted (d*(-1,1)) cutbefore topboundary p) cutafter leftboundary p
+enddef ;
+
+primarydef p inset d =
+  ((ulcorner p -- llcorner p -- lrcorner p -- urcorner p -- cycle)
+      shifted (d*(1,-1)) cutbefore bottomboundary p) cutafter rightboundary p
+enddef ;
+
+vardef equalpaths(expr p, q) =
+  if length(p) = length(q) :
+    save ok ; boolean ok ; ok := true ;
+    for i = 0 upto length(p)-1 :
+      ok := ok and (round(point i of p) = round(point i of q)) ;
+    endfor ;
+    ok
+  else :
+    false
+  fi
+enddef ;
+
+endinput ;
diff --git a/metapost/context/base/mp-form.mpiv b/metapost/context/base/mpiv/mp-form.mpiv
index 88b15e097..88b15e097 100644
--- a/metapost/context/base/mp-form.mpiv
+++ b/metapost/context/base/mpiv/mp-form.mpiv
diff --git a/metapost/context/base/mp-func.mpiv b/metapost/context/base/mpiv/mp-func.mpiv
index b1b9d6d5d..b1b9d6d5d 100644
--- a/metapost/context/base/mp-func.mpiv
+++ b/metapost/context/base/mpiv/mp-func.mpiv
diff --git a/metapost/context/base/mp-grap.mpiv b/metapost/context/base/mpiv/mp-grap.mpiv
index 4fd8ee5bd..4fd8ee5bd 100644
--- a/metapost/context/base/mp-grap.mpiv
+++ b/metapost/context/base/mpiv/mp-grap.mpiv
diff --git a/metapost/context/base/mp-grid.mpiv b/metapost/context/base/mpiv/mp-grid.mpiv
index b9243b1b9..b9243b1b9 100644
--- a/metapost/context/base/mp-grid.mpiv
+++ b/metapost/context/base/mpiv/mp-grid.mpiv
diff --git a/metapost/context/base/mp-grph.mpiv b/metapost/context/base/mpiv/mp-grph.mpiv
index 5938b9f02..5938b9f02 100644
--- a/metapost/context/base/mp-grph.mpiv
+++ b/metapost/context/base/mpiv/mp-grph.mpiv
diff --git a/metapost/context/base/mp-idea.mpiv b/metapost/context/base/mpiv/mp-idea.mpiv
index 462d97553..462d97553 100644
--- a/metapost/context/base/mp-idea.mpiv
+++ b/metapost/context/base/mpiv/mp-idea.mpiv
diff --git a/metapost/context/base/mp-luas.mpiv b/metapost/context/base/mpiv/mp-luas.mpiv
index c919ba215..c919ba215 100644
--- a/metapost/context/base/mp-luas.mpiv
+++ b/metapost/context/base/mpiv/mp-luas.mpiv
diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv
index 2c84d01c2..2c84d01c2 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mpiv/mp-mlib.mpiv
diff --git a/metapost/context/base/mp-page.mpiv b/metapost/context/base/mpiv/mp-page.mpiv
index a6fa3fba3..a6fa3fba3 100644
--- a/metapost/context/base/mp-page.mpiv
+++ b/metapost/context/base/mpiv/mp-page.mpiv
diff --git a/metapost/context/base/mp-shap.mpiv b/metapost/context/base/mpiv/mp-shap.mpiv
index 713656510..713656510 100644
--- a/metapost/context/base/mp-shap.mpiv
+++ b/metapost/context/base/mpiv/mp-shap.mpiv
diff --git a/metapost/context/base/mp-step.mpiv b/metapost/context/base/mpiv/mp-step.mpiv
index f7a7ba5de..f7a7ba5de 100644
--- a/metapost/context/base/mp-step.mpiv
+++ b/metapost/context/base/mpiv/mp-step.mpiv
diff --git a/metapost/context/base/mp-symb.mp b/metapost/context/base/mpiv/mp-symb.mpiv
index a84c84e82..a84c84e82 100644
--- a/metapost/context/base/mp-symb.mp
+++ b/metapost/context/base/mpiv/mp-symb.mpiv
diff --git a/metapost/context/base/mp-text.mpiv b/metapost/context/base/mpiv/mp-text.mpiv
index b68e8412a..b68e8412a 100644
--- a/metapost/context/base/mp-text.mpiv
+++ b/metapost/context/base/mpiv/mp-text.mpiv
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv
index 13104f17e..13104f17e 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mpiv/mp-tool.mpiv
diff --git a/metapost/context/fonts/bidi-symbols.mp b/metapost/context/fonts/mpiv/bidi-symbols.mp
index abe48b951..abe48b951 100644
--- a/metapost/context/fonts/bidi-symbols.mp
+++ b/metapost/context/fonts/mpiv/bidi-symbols.mp
diff --git a/metapost/context/fonts/bidi-symbols.tex b/metapost/context/fonts/mpiv/bidi-symbols.tex
index ba659ccb7..ba659ccb7 100644
--- a/metapost/context/fonts/bidi-symbols.tex
+++ b/metapost/context/fonts/mpiv/bidi-symbols.tex
diff --git a/metapost/context/fonts/demo-symbols.mp b/metapost/context/fonts/mpiv/demo-symbols.mp
index 822854c94..822854c94 100644
--- a/metapost/context/fonts/demo-symbols.mp
+++ b/metapost/context/fonts/mpiv/demo-symbols.mp
diff --git a/metapost/context/fonts/demo-symbols.tex b/metapost/context/fonts/mpiv/demo-symbols.tex
index e9af4a027..e9af4a027 100644
--- a/metapost/context/fonts/demo-symbols.tex
+++ b/metapost/context/fonts/mpiv/demo-symbols.tex
diff --git a/metapost/context/fonts/punkfont-bold.mp b/metapost/context/fonts/mpiv/punkfont-bold.mp
index 1c62963f9..1c62963f9 100644
--- a/metapost/context/fonts/punkfont-bold.mp
+++ b/metapost/context/fonts/mpiv/punkfont-bold.mp
diff --git a/metapost/context/fonts/punkfont-boldslanted.mp b/metapost/context/fonts/mpiv/punkfont-boldslanted.mp
index 3e5fa1561..3e5fa1561 100644
--- a/metapost/context/fonts/punkfont-boldslanted.mp
+++ b/metapost/context/fonts/mpiv/punkfont-boldslanted.mp
diff --git a/metapost/context/fonts/punkfont-characters.mp b/metapost/context/fonts/mpiv/punkfont-characters.mp
index da0015b02..da0015b02 100644
--- a/metapost/context/fonts/punkfont-characters.mp
+++ b/metapost/context/fonts/mpiv/punkfont-characters.mp
diff --git a/metapost/context/fonts/punkfont-definitions.mp b/metapost/context/fonts/mpiv/punkfont-definitions.mp
index 2901a9d03..2901a9d03 100644
--- a/metapost/context/fonts/punkfont-definitions.mp
+++ b/metapost/context/fonts/mpiv/punkfont-definitions.mp
diff --git a/metapost/context/fonts/punkfont-slanted.mp b/metapost/context/fonts/mpiv/punkfont-slanted.mp
index 5c1ff46b2..5c1ff46b2 100644
--- a/metapost/context/fonts/punkfont-slanted.mp
+++ b/metapost/context/fonts/mpiv/punkfont-slanted.mp
diff --git a/metapost/context/fonts/punkfont.mp b/metapost/context/fonts/mpiv/punkfont.mp
index 2a03aae81..2a03aae81 100644
--- a/metapost/context/fonts/punkfont.mp
+++ b/metapost/context/fonts/mpiv/punkfont.mp
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index d00118098..12fec2656 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/lang-all.xml b/tex/context/base/lang-all.xml
deleted file mode 100644
index 503cb0ae5..000000000
--- a/tex/context/base/lang-all.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-
-<!-- author: Willy Egger -->
-
-<descriptions>
-
-<description language='ba'>
-    <sourcefile>bahyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the  Basque language</title>
-    <copyright>
-        <year>1991</year>
-        <owner>Julio Sanchez (jsanchez@gmv.es)</owner>
-        <comment>These patterns have been derived from "On Word Division in Spanish"
-            Jos'e A. Ma~nas</comment>
-    </copyright>
-    <copyright>
-        <year>1997</year>
-        <owner>Juan M. Aguirregabiria (wtpagagj@lg.ehu.es)</owner>
-        <comment>Adaption to TeX based on shyphen.sh</comment>
-    </copyright>
-</description>
-
-<description language='ca'>
-    <sourcefile>cahyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Catalan language</title>
-    <remarks>Version 1.11</remarks>
-    <copyright>
-        <year>1991-1995 </year>
-        <owner>Gon\c{c}al Badenes,Francina Turon</owner>
-    </copyright>
-    <copyright>
-        <year>1991-2003</year>
-        <owner>Gon\c{c}al Badenes</owner>
-    </copyright>
-</description>
-
-<description language='cy'>
-    <sourcefile>cyhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Welsh Language</title>
-    <remarks>v3,GNU General Public License</remarks>
-    <copyright>
-        <year>1996</year>
-        <owner>Yannis Haralambous</owner>
-        <comment>Inputs cathyph.tex, patterns in EC/DC encoding</comment>
-    </copyright>
-</description>
-
-<description language='cz'>
-    <sourcefile>czhyphen.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Czech language</title>
-    <copyright>
-        <year>1991</year>
-        <owner>Karel Horak</owner>
-        <comment>List of exceptions</comment>
-    </copyright>
-    <copyright>
-        <year>1995</year>
-        <owner>Pavel Sevecek (\v{S}eve\v{c}ek) (pavel@lingea.cz)</owner>
-        <comment>Macros, adaption for TeX 2</comment>
-    </copyright>
-    <!-- samples>
-        <sample>au-to-ma-tic-ký</sample>
-        <sample>bram-bo-rák</sample>
-        <sample>da-ta-bá-ze</sample>
-        <sample>kr-ka-vec</sample>
-        <sample>Kro-me-ríš</sample>
-        <sample>ob-hos-po-da-ro-vat</sample>
-        <sample>rem-dich</sample>
-        <sample>scvrk-nout</sample>
-        <sample>za-les-nit</sample>
-        <sample>že-žu-lic-ka</sample>
-    </samples -->
-</description>
-
-<description language='da'>
-    <sourcefile>dkspecial.tex dkcommon.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Danish language</title>
-    <copyright/>
-</description>
-
-<description language='de'>
-    <sourcefile>dehyphn.tex</sourcefile>
-    <title>TeX hyphenation patterns for the German language (new orthography)</title>
-    <copyright>
-        <year>1988, 1991</year>
-        <owner>Rechenzentrum der Ruhr-Universitaet Bochum</owner>
-        <comment>German hyphen patterns</comment>
-    </copyright>
-    <copyright>
-        <year>1993, 1994, 1999</year>
-        <owner>Bernd Raichle/DANTE e.V.</owner>
-        <comment>Macros, adaption for TeX 2</comment>
-    </copyright>
-    <copyright>
-        <year>1998-2001</year>
-        <owner>Walter Schmidt</owner>
-        <comment>Adaption to new German orthography</comment>
-    </copyright>
-</description>
-
-<description language='deo'>
-    <sourcefile>dehypht.tex</sourcefile>
-    <title>TeX hyphenation patterns for the German language (traditional orthography)</title>
-    <copyright>
-        <year>1988, 1991</year>
-        <owner>Rechenzentrum der Ruhr-Universitaet Bochum</owner>
-        <comment>German hyphen patterns</comment>
-    </copyright>
-    <copyright>
-        <year>1993, 1994, 1999</year>
-        <owner>Bernd Raichle/DANTE e.V.</owner>
-        <comment>Macros, adaption for TeX 2</comment>
-    </copyright>
-</description>
-
-<description language='en'>
-    <sourcefile>hyphen.tex</sourcefile>
-    <title>Plain TeX hyphenation patterns for the English language (US) </title>
-    <remarks>[NOT TO BE CHANGED IN ANY WAY!]</remarks>
-    <copyright/>
-</description>
-
-<description language='es'>
-    <sourcefile>eshyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Spanish language</title>
-    <copyright>
-        <year>1993</year>
-        <owner>Francesc Carmona (franc@porthos.bio.ub.es)</owner>
-    </copyright>
-</description>
-
-<description language='fi'>
-    <sourcefile>fihyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Finnish language</title>
-    <copyright>
-        <year>1986</year>
-        <owner>Kauko Saarinen</owner>
-        <comment>First release</comment>
-    </copyright>
-    <copyright>
-        <year>1988</year>
-        <owner>Fred Karlsson</owner>
-        <comment>Completely rewritten patterns</comment>
-    </copyright>
-	    <copyright>
-        <year>1989</year>
-        <owner>Fred Karlsson</owner>
-        <comment>Some vowel tripples added</comment>
-    </copyright>
-	<copyright>
-        <year>1995</year>
-        <owner>Thomas Esser</owner>
-        <comment>Added \uccode and \lccode </comment>
-    </copyright>
-</description>
-
-<description language='fr'>
-    <sourcefile>frhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the French language</title>
-    <remarks>V2.11</remarks>
-    <copyright>
-        <owner>Jacques Desarmenien, Norman Buckle, Michael Ferguson, Justin Bur, Daniel Flipo and Bernard Gaulle</owner>
-    </copyright>
-    <copyright>
-        <year>1996</year>
-        <owner>Bernd Raichle/DANTE e.V.</owner>
-        <comment>Adaption for TeX 3.x and MLTeX 3.x (2.x)</comment>
-    </copyright>
-</description>
-
-<description language='hr'>
-    <sourcefile> hrhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Croatian language</title>
-    <copyright>
-        <year>1994, 1996</year>
-        <owner>Marinovi\'c Igor (migor@student.math.hr)</owner>
-    </copyright>
-</description>
-
-<description language='hu'>
-    <sourcefile> huhyphn.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Hungarian language</title>
-</description>
-
-<description language='is'>
-    <sourcefile>ishyph.tex</sourcefile>
-    <title>Plain TeX hyphenation patterns for the Icelandic language</title>
-    <remarks>[NOT TO BE CHANGED IN ANY WAY!]</remarks>
-    <copyright>
-        <year>1987</year>
-        <owner>Jorgen Pind</owner>
-    </copyright>
-</description>
-
-<description language='it'>
-    <sourcefile>ithyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Italian language</title>
-    <remarks>v4.8d</remarks>
-    <copyright>
-        <year>1998, 2001</year>
-        <owner>Claudio Beccari</owner>
-    </copyright>
-    <copyright>
-        <year>1993, 1994, 1999</year>
-        <owner>Bernd Raichle/DANTE e.V.</owner>
-        <comment>Macros, adaption for TeX 2</comment>
-    </copyright>
-</description>
-
-<description language='la'>
-    <sourcefile>lahyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Latin language</title>
-    <remarks>v3.0b</remarks>
-    <copyright>
-        <year>1999-2001</year>
-        <owner>Claudio Beccari</owner>
-    </copyright>
-    <copyright>
-        <year>1993, 1994, 1998, 1999</year>
-        <owner>Bernd Raichle/DANTE e.V.</owner>
-        <comment>Macro code in 'dehypht.tex'</comment>
-    </copyright>
-</description>
-
-<description language='nl'>
-    <sourcefile>nehyph96.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Dutch language</title>
-    <copyright>
-        <year>1996</year>
-        <owner> Piet Tutelaers (P.T.H.Tutelaers@tue.nl)</owner>
-        <comment>8-bit hyphenation patterns for TeX based upon the new Dutch
-          spelling, officially since 1 August 1996. These patterns follow
-          the new hyphenation rules in the `Woordenlijst Nederlandse
-          Taal, SDU Uitgevers, Den Haag 1995' (the so called `Groene
-          Boekje') described in section 5.2 (Het afbreekteken)</comment>
-    </copyright>
-</description>
-
-<!-- Watch the next one: what a naming mess. What user can keep track of
-such an inconsistent name scheme (well, no name scheme). Please warn me
-when yet another name shows up -->
-
-<description language='no'>
-    <sourcefile>nohyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Norwegian language</title>
-    <copyright>
-        <year>2005</year>
-        <owner>Rune Kleveland with patches from Ole Michael Selberg</owner>
-        <comment>nohyphbx.tex</comment>
-    </copyright>
-    <copyright>
-        <year>200+</year>
-        <owner>Rune Kleveland</owner>
-        <comment>nohyphb.tex</comment>
-    </copyright>
-    <copyright>
-        <year>199+</year>
-        <owner>Dag Langmyhr and student</owner>
-        <comment>nohyph2.tex</comment>
-    </copyright>
-    <copyright>
-        <year>199+</year>
-        <owner>Ivar Aavatsmark and others</owner>
-        <comment>nohyph.tex sometimes named nohyph1.tex</comment>
-    </copyright>
-    <copyright>
-        <year>1992,1993</year>
-        <owner>Ivar Aavatsmark</owner>
-        <comment>nohyphen.tex based on danhyph.tex</comment>
-    </copyright>
-    <copyright>
-        <year>1994</year>
-        <owner>Preben Randhol, Jon Martin Solaas</owner>
-    </copyright>
-    <copyright>
-        <year>1995</year>
-        <owner>Thomas Esser (te@dbs.uni-hannover.de)</owner>
-        <comment>Make patterns work with non-T1 encoding</comment>
-    </copyright>
-</description>
-
-<description language='pl'>
-    <sourcefile>plhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Polish language</title>
-    <copyright/>
-</description>
-
-<description language='pt'>
-    <sourcefile>pthyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Portuguese language</title>
-    <copyright/>
-</description>
-
-<description language='ro'>
-    <sourcefile>rohyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Romanian language</title>
-    <copyright/>
-</description>
-
-<description language='sk'>
-    <sourcefile>skhyphen.tex skhyphen.ex</sourcefile>
-    <title>TeX hyphenation patterns for the Slovakian language</title>
-    <copyright>
-        <year>1992</year>
-        <owner>Jana Chlebikova</owner>
-    </copyright>
-    <copyright>
-        <year>1991</year>
-        <owner>Karel Horak</owner>
-        <comment>List of exceptions</comment>
-    </copyright>
-</description>
-
-<description language='sl'>
-    <sourcefile>sihyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Slovenian language</title>
-    <copyright>
-        <year>1990</year>
-        <owner>TeXCeX (SLO),TeXCeH Norbert Schwarz</owner>
-    </copyright>
-	<copyright>
-        <year>1994</year>
-        <owner>Leon "Zlajpah (leon.zlajpah@ijs.si)</owner>
-        <comment>Use of code page 852 in patterns</comment>
-    </copyright>
-    <copyright>
-        <year>1995,1997</year>
-        <owner>Leon "Zlajpah (leon.zlajpah@ijs.si)</owner>
-        <comment>Adaptaion of Slovenian hyphenation pattens, macros</comment>
-    </copyright>
-</description>
-
-<description language='sv'>
-    <sourcefile>svhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the Swedish language</title>
-    <copyright>
-        <year>1991,1994</year>
-        <owner>Jan Michael Rynning</owner>
-    </copyright>
-</description>
-
-<description language='tr'>
-    <sourcefile>tkhyph.tex</sourcefile>
-    <title>TeX hyphenation patterns for the modern Turkish language</title>
-    <copyright>
-        <year>1996</year>
-        <owner>Yannis Haralambous</owner>
-        <comment>A mechanically generated Turkish Hyphenation table for TeX,
-			using the University of Washington diacritical coding
-			developed by P. A. MacKay for the Ottoman Texts Project</comment>
-    </copyright>
-</description>
-
-<description language='uk'>
-    <sourcefile>ukhyphen.tex</sourcefile>
-    <title>TeX hyphenation patterns for the English language (UK)</title>
-    <copyright/>
-</description>
-
-<description language='vn'>
-    <comment>Vietnamese needs no patterns.</comment>
-</description>
-
-<description language='agr'>
-    <sourcefile>grahyph4.tex</sourcefile>
-    <title>TeX hyphenation patterns for the ancient Greek language</title>
-    <copyright>
-        <year>2004</year>
-        <owner>Dimitrios Filippou</owner>
-        <comment>These hyphenation patterns are explained in "ancient.pdf".
-            Hyphenation examples are given in the file "anc-test.pdf".
-            Some doubtful patterns are marked by three question marks "???".</comment>
-    </copyright>
-</description>
-
-</descriptions>
diff --git a/tex/context/base/m-datastrc.tex b/tex/context/base/m-datastrc.tex
deleted file mode 100644
index 1fd5a9e42..000000000
--- a/tex/context/base/m-datastrc.tex
+++ /dev/null
@@ -1,228 +0,0 @@
-%D \module
-%D   [       file=m-datastrc, % was: core-dat % was core-02a
-%D        version=1999.08.10,               % 1997.03.31,
-%D          title=\CONTEXT\ Modules,
-%D       subtitle=Database Support,         % 2A
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\writestatus{loading}{ConTeXt Core Macros / Database Support}
-
-\unprotect
-
-%D This module is a (limited) rewrite of the original \type
-%D {core-02a} module, the module that dealt with managing a
-%D database of addresses. The principles and methods have not
-%D changed; they are only generalized.
-%D
-%D A database file |<|in most cases such a base is generated
-%D from another one|>| is structured as follows:
-%D
-%D \starttyping
-%D \startrecord{tag}
-%D   \memberofgroup{grouplist}
-%D   \setrecordentry{name}{...}
-%D   ....
-%D \stoprecord
-%D \stoptyping
-%D
-%D The interface to such a database is defined as follows:
-%D
-%D \starttyping
-%D \definerecord[class][settings]
-%D \setuprecord[class][settings]
-%D \definerecordentry[class][name]
-%D \stoptyping
-%D
-%D and processed by
-%D
-%D \starttyping
-%D \processrecords[file list][tag and/or group list]
-%D \stoptyping
-%D
-%D The actual processing is done by a macro assigned to \type
-%D {command}:
-%D
-%D \starttyping
-%D \setuprecord[class][command=\DoWithRecord]
-%D \stoptyping
-%D
-%D Given that one can ask for a field with
-%D
-%D \starttyping
-%D \getrecordentry{name}
-%D \stoptyping
-%D
-%D such a command can look like:
-%D
-%D \starttyping
-%D \def\DoWithRecord#1%
-%D   {\startpacked
-%D    \let\\=\quad
-%D    name:  \getrecordentry{name}~\getrecordentry{family name}\par
-%D    address: \getrecordentry{postal address}\par
-%D    \stoppacked}
-%D \stoptyping
-%D
-%D The argument passed is the tag. The database can look like:
-%D
-%D \starttyping
-%D \startrecord{hagenj}
-%D   \memberofgroup{a,b}
-%D   \setrecordentry{naam}{Hans}
-%D   \setrecordentry{family name}{Hagen}
-%D   \setrecordentry{postal address}{J. Hagen\\Ridderstraat 29\\Hasselt NL}
-%D \stoprecord
-%D
-%D \startrecord{ottenaf}
-%D   \memberofgroup{a}
-%D   \setrecordentry{name}{Ton}
-%D   \setrecordentry{family name}{Otten}
-%D   \setrecordentry{postal address}{A.F. Otten\\Prinsengracht 17\\Hasselt NL}
-%D \stoprecord
-%D \stoptyping
-%D
-%D The definition of this database looks like:
-%D
-%D \starttyping
-%D \definerecord[address][command=\DoWithRecord]
-%D
-%D \definerecordentry[address][name]
-%D \definerecordentry[address][family name]
-%D \definerecordentry[address][postal address]
-%D \stoptyping
-%D
-%D The actual processing is now done by (for instance):
-%D
-%D \starttyping
-%D \processrecords[datafile][hagenj]
-%D \processrecords[datafile][hagenj,offenaf]
-%D \processrecords[datafile][all]
-%D \processrecords[datafile][a]
-%D \processrecords[datafile][b]
-%D \stoptyping
-%D
-%D Of course one can reassign the command used to handle the
-%D records in between.
-
-% \??kt ->
-% \??kw ->
-
-\def\??db    {@@db}
-\def\c!velden{velden}
-
-%\newevery \everyrecord \EveryRecord
-
-\def\definerecord
-  {\dodoubleempty\dodefinerecord}
-
-\def\dodefinerecord[#1][#2]%
-  {\getparameters
-     [\??db#1]
-     [\c!velden=,
-      \c!command=\gobbleoneargument,
-      #2]}
-
-\def\setuprecord
-  {\dodoubleargument\dosetuprecord}
-
-\def\dosetuprecord[#1][#2]%
-  {\getparameters[\??db#1][#2]}%
-
-\def\definerecordentry[#1][#2]%
-  {\edef\recordentries{\getvalue{\??db#1\c!velden}}%
-   \addtocommalist{#2}\recordentries
-   \letvalue{\??db#1\c!velden}\recordentries}
-
-%D Watch out: the entries are defined global! While
-%D processing a record, no grouping is applied.
-
-\def\getrecordentry   #1{\getvalue      {\??db:#1}}
-\def\resetrecordentry #1{\letgvalueempty{\??db:#1}}
-\def\assignrecordentry#1{\setgvalue     {\??db:#1}}
-
-\long\def\skiprecord#1\stoprecord
-  {\egroup}
-
-\newif\ifrecordok
-
-\newtoks\resetrecordlist
-
-\def\processrecords
-  {\dotripleargument\doprocessrecords}
-
-\def\doprocessrecords[#1][#2][#3]%
-  {\bgroup
-   \ifx\\\undefined\let\\\relax\fi
-   \def\docommand##1%
-     {\resetrecordentry{##1}%
-      \appendtoks\resetrecordentry{##1}\to\resetrecordlist}%
-   \processcommacommand[\getvalue{\??db#1\c!velden}]\docommand
-   \let\setrecordentry\skiprecord
-   \the\resetrecordlist
-   \doifelse{#2}\v!all   % 't Is nu eenmaal alles
-     \recordoktrue
-     {\doifelsenothing{#2} % of niets
-        \recordoktrue
-        \recordokfalse}%   % zullen we maar zeggen.
-   \ifrecordok
-     \let\askedrecords\v!all
-   \else
-     \makerawcommalist[#2]\askedrecords
-   \fi
-   \def\checkrecord##1%
-     {\rawdoifinsetelse{##1}{\askedrecords}{\recordoktrue}{}}%
-   \def\presetrecord##1%
-     {\let\setrecordentry\assignrecordentry
-      \let\memberofgroup\gobbleoneargument
-      \the\resetrecordlist
-      \def\stoprecord{\dostoprecord{##1}}}%
-   \def\memberofgroup##1%
-     {\doifsomething{##1}
-        {\rawprocesscommalist[##1]\checkrecord}%
-      \ifrecordok
-        \presetrecord{##1}%
-      \else
-        \expandafter\skiprecord
-      \fi}%
-   \def\startrecord##1%
-     {\bgroup
-      \ifrecordok
-        \presetrecord{##1}%
-      \else
-        \checkrecord{##1}%
-        \ifrecordok
-          \presetrecord{##1}%
-        \fi
-      \fi}%
-   \def\dostoprecord##1%
-     {\relax
-      \egroup
-     %\the\everyrecord
-      \getvalue{\??db#1\c!command}{##1}}%
-   \showmessage\m!databases1\askedrecords
-   \def\doprocessrecords##1%
-     {\readjobfile{##1}
-        {\showmessage\m!databases2{(job)}}
-        {\readsysfile{##1}
-           {\showmessage\m!databases3{(sys)}}
-           {\showmessage\m!databases4{}}}}%
-   \processcommalist[#3]\doprocessrecords
-   \egroup}
-
-%D While writing the original implementation, I did some
-%D experiments with \type {%} before each entry and changing
-%D the category code of the comment char. Because \TEX\ scans
-%D the line anyway |<|this is needed because the end of line
-%D character can be non standard|>| this is not faster.
-%D
-%D Although this mechanism could have been combined with the
-%D block moving mechanism, the current implementation is
-%D prefered out of speed reasons.
-
-\protect \endinput
diff --git a/tex/context/base/m-newmat.tex b/tex/context/base/m-newmat.tex
deleted file mode 100644
index 202fec76f..000000000
--- a/tex/context/base/m-newmat.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%D \module
-%D   [       file=m-newmat,
-%D        version=2000.11.16,
-%D          title=\CONTEXT\ Math Module,
-%D       subtitle=AMS-like math extensions,
-%D         author={Taco Hoekwater \& Hans Hagen},
-%D           date=\currentdate,
-%D      copyright={Taco Hoekwater \& Hans Hagen}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
-%C details.
-
-\unprotect
-
-%D Code has been integrated.
-
-\protect \endinput
-
-%D This module collects macros that \TEX\ users kind of expect
-%D to be available when typesetting math. Most of them
-%D originate in the \AMS\ macro packages. We have taken the
-%D freedom to adapt them to \CONTEXT. This module is derived
-%D from the \type {m-math} module by Taco Hoekwater (partially
-%D derived from AMS math modules) and adapted|/|extended by
-%D Hans Hagen.
-
-%D \macros
-%D   {startsubarray,substack,startsmallmatrix}
-%D
-%D [HH] I wonder what these are supposed to do. An example
-%D will be inserted later. Contrary to the original we
-%D support an optional argument between either \type {{}} or
-%D \type {[]}.
-
-\def\startsubarray
-  {\doifnextcharelse\bgroup
-     \simplestartsubarray{\dosingleempty\complexstartsubarray}}
-
-\def\complexstartsubarray[#1]%
-  {\simplestartsubarray{#1}}
-
-\def\simplestartsubarray#1%
-  {\vcenter\bgroup
-   \baselineskip\fontdimen10 \scriptfont\plustwo
-   \advance\baselineskip\fontdimen12 \scriptfont\plustwo
-   \lineskip\plusthree\fontdimen8 \scriptfont\plusthree
-   \lineskiplimit\lineskip
-   \ialign\bgroup\ifx c#1\hfil\fi$\mathsurround\zeropoint\scriptstyle##$\hfil\crcr}
-
-\def\stopsubarray
-  {\crcr\egroup
-   \egroup}
-
-\def\startsubstack
-  {\doifnextcharelse\bgroup
-     \simplestartsubstack{\dosingleempty\complexstartsubstack}}
-
-\def\complexstartsubstack[#1]%
-  {\simplestartsubstack{#1}}
-
-\def\simplesubstack#1%
-  {\startsubarray[c]#1\stopsubarray}
-
-\def\startsmallmatrix
-  {\null
-   \,%
-   \vcenter\bgroup
-   \baselineskip6\ex@
-   \lineskip1.5\ex@
-   \lineskiplimit\lineskip
-   \ialign\bgroup\hfil$\mathsurround\zeropoint\scriptstyle##$\hfil&&\thickspace\hfil
-     $\mathsurround\zeropoint\scriptstyle##$\hfil\crcr}
-
-\def\stopsmallmatrix
-  {\crcr\egroup
-   \egroup
-   \,}
-
-\protect \endinput
diff --git a/tex/context/base/m-streams.tex b/tex/context/base/m-streams.tex
deleted file mode 100644
index a8589a89c..000000000
--- a/tex/context/base/m-streams.tex
+++ /dev/null
@@ -1,446 +0,0 @@
-%D \module
-%D   [       file=m-streams,
-%D        version=2006.03.21,
-%D          title=\CONTEXT\ Modules,
-%D       subtitle=Streams,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D First we implement a simple left||right synchronization
-%D mechanism, which we may perfect and extend over time.
-
-\unprotect
-
-\defineoutputstream [\v!left]
-\defineoutputstream [\v!right]
-
-\definemarknote[\v!left]
-\definemarknote[\v!right]
-
-\startsetups stream:\v!left:bottom
-    \flushmarknotes[\v!left]
-\stopsetups
-\startsetups stream:\v!right:bottom
-    \flushmarknotes[\v!right]
-\stopsetups
-\startsetups stream:\v!left:reset
-   \erasemarknotes[\v!left]
-\stopsetups
-\startsetups stream:\v!right:reset
-   \erasemarknotes[\v!right]
-\stopsetups
-
-\def\LeftNote               {\setmarknote             [\v!left]}  % {#1}
-\def\RightNote              {\setmarknote             [\v!right]} % {#1}
-\def\SwitchToLeft           {\enableoutputstream      [\v!left]}
-\def\SwitchToRight          {\enableoutputstream      [\v!right]}
-\def\SwitchToNormal         {\enableoutputstream      [\s!default]}
-\def\SynchronizeLeftAndRight{\synchronizeoutputstreams[\v!left,\v!right]}
-\def\FlushLeftAndRight      {\flushoutputstreampages  [\v!left,\v!right]}
-
-\protect
-
-% \topskip     \strutheight
-% \splittopskip\strutheight
-
-%D Example of usage:
-%D
-%D \starttyping
-%D \nopenalties \setupinterlinespace[top=height] \setupcolors[state=start]
-%D
-%D \showgrid \showstruts
-%D
-%D \starttext
-%D
-%D \title{Whatever} \page
-%D
-%D \dorecurse {5} {
-%D     \let\RecurseLevel\recurselevel
-%D     \SwitchToLeft   \dorecurse{10}{\dontleavehmode{\tf\RecurseLevel:l \begstrut \input tufte \endstrut \endgraf}}
-%D     \SwitchToRight  \dorecurse{10}{\dontleavehmode{\sl\RecurseLevel:r \begstrut \input knuth \endstrut \endgraf}}
-%D     \SwitchToNormal \SynchronizeLeftAndRight
-%D     \SwitchToLeft   \dorecurse{10}{\dontleavehmode{\bf\RecurseLevel:l \begstrut \input zapf  \endstrut \endgraf}}
-%D     \SwitchToRight  \dorecurse{10}{\dontleavehmode{\bs\RecurseLevel:r \begstrut \input davis \endstrut \endgraf}}
-%D     \SwitchToNormal \SynchronizeLeftAndRight
-%D }
-%D
-%D \FlushLeftAndRight
-%D
-%D \stoptext
-%D \stoptyping
-%D
-%D Another example:
-%D
-%D \starttyping
-%D \nopenalties \setupinterlinespace[top=height] \setupcolors[state=start]
-%D
-%D \showgrid \showstruts
-%D
-%D \starttext
-%D
-%D \SwitchToNormal \FlushLeftAndRight \page
-%D
-%D \def\StartCouple{\page\SwitchToNormal}
-%D \def\StopCouple {\SwitchToNormal \SynchronizeLeftAndRight \FlushLeftAndRight}
-%D
-%D \def\Original   {\SwitchToNormal\SynchronizeLeftAndRight\SwitchToLeft}
-%D \def\Translation{\SwitchToRight}
-%D
-%D \StartCouple
-%D \dorecurse{10} {
-%D     \Original    o: \begstrut \inright{\blackrule}\input tufte   \endstrut \LeftNote {tufte}   \endgraf
-%D     \Translation t: \begstrut \inleft {\blackrule}\input zapf    \endstrut \RightNote{zapf}    \endgraf
-%D     \Original    o: \begstrut \inright{\blackrule}\input knuth   \endstrut \LeftNote {knuth}   \endgraf
-%D     \Translation t: \begstrut \inleft {\blackrule}\input davis   \endstrut \RightNote{davis}   \endgraf
-%D     \Original    o: \begstrut \inright{\blackrule}\input douglas \endstrut \LeftNote {douglas} \endgraf
-%D     \Translation t: \begstrut \inleft {\blackrule}\input bryson  \endstrut \RightNote{bryson}  \endgraf
-%D }
-%D \StopCouple
-%D \stoptext
-%D \stoptyping
-
-%D Next we implement stream layers.
-
-\unprotect
-
-\def\overloadtextwidth#1%
-  {\makeupwidth#1\relax
-   \textwidth\makeupwidth
-   \hsize\makeupwidth}
-
-\startsetups streamlayer:default:settings
-  % set hsize etc, like \overloadtextwidth{12cm}
-\stopsetups
-
-\startsetups streamlayer:default:extras
-  % flush goodies, like local floats
-\stopsetups
-
-\startsetups streamlayer:default:place
-  \setlayer
-    [\currentstreamlayer]
-    [\c!preset=\v!left\v!top]
-    {\outputstreambox[\currentstreamlayer]}%
-\stopsetups
-
-\startsetups streamlayer:default:copy
-  \setlayer
-    [\currentstreamlayer]
-    [\c!preset=\v!left\v!top]
-    {\outputstreamcopy[\currentstreamlayer]}%
-\stopsetups
-
-\startsetups streamlayer:default:reset
-   \outputstreambox[\currentstreamlayer]
-\stopsetups
-
-\startsetups streamlayer:default:flush
-    \tightlayer[\currentstreamlayer]
-\stopsetups
-
-\def\definestreamlayer
-  {\dodoubleempty\dodefinestreamlayer}
-
-\def\dodefinestreamlayer[#1][#2]%
-  {\defineoutputstream[#1]%
-   \defineoutputstream[main]%
-   \definelayer[#1][\c!method=\v!fit,\c!width=\textwidth,#2]}
-
-\def\dostreamsetups#1%
-  {\doifsetupselse{streamlayer:\currentstreamlayer:#1}
-     {\directsetup{streamlayer:\currentstreamlayer:#1}}
-     {\directsetup{streamlayer:\s!default:#1}}}
-
-\def\startstreamlayer[#1]%
-  {\bgroup
-%    \def\startstreamlayer[##1]{\bgroup\let\stopstreamlayer\egroup}%
-   \edef\currentstreamlayer{#1}%
-   \enableoutputstream[main]%
-   \synchronizeoutput
-   \enableoutputstream[\currentstreamlayer]%
-   \bgroup
-   \dostreamsetups{settings}}
-
-\def\stopstreamlayer
-  {\endgraf
-   \egroup
-   \disableoutputstream % \enableoutputstream[\s!default]%
-   \outputstreambox[main]%
-%    \dostreamsetups{place}%
-%    \dostreamsetups{extras}%
-%    \dostreamsetups{flush}%
-   \egroup}
-
-\def\preparestreamlayer{\dosingleempty\dopreparestreamlayer}
-\def\flushstreamlayer  {\dosingleempty\doflushstreamlayer  }
-\def\placestreamlayer  {\dosingleempty\doplacestreamlayer  }
-
-\def\dopreparestreamlayer[#1]%
-  {\bgroup
-   \edef\currentstreamlayer{\iffirstargument#1\else\currentstreamlayer\fi}%
-   \dostreamsetups{place}%
-   \dostreamsetups{extras}%
-%  \dostreamsetups{flush}%
-   \egroup}
-
-\def\doflushstreamlayer[#1]%
-  {\bgroup
-   \edef\currentstreamlayer{\iffirstargument#1\else\currentstreamlayer\fi}%
-   \dostreamsetups{flush}%
-   \egroup}
-
-\def\doplacestreamlayer[#1]%
-  {\preparestreamlayer[#1]%
-   \flushstreamlayer[#1]}
-
-\protect
-
-%D Usage:
-
-%D \starttyping
-%D \setupinterlinespace[top=height]
-%D
-%D \setupcolors[state=start]
-%D
-%D \definestreamlayer[block]
-%D
-%D \definemeasure[localtextwidth] [\dimexpr.7\textwidth\relax]
-%D \definemeasure[localfloatwidth][\dimexpr.3\textwidth-2\bodyfontsize\relax]
-%D
-%D \startsetups streamlayer:block:settings
-%D   \hsize=\measure{localtextwidth}
-%D   \setupfloat[figure][maxwidth=\measure{localfloatwidth}]
-%D \stopsetups
-%D
-%D \startsetups streamlayer:block:extras
-%D   \setuplocalfloats
-%D     [before=\blank,
-%D      after=\blank,
-%D      inbetween=\blank]
-%D   \setbox\scratchbox\vbox{\hsize\measure{localfloatwidth}\getlocalfloats}
-%D   \ifdim\ht\scratchbox>\thelayerheight\currentstreamlayer\relax
-%D     % more float than text
-%D     \setlayerframed
-%D       [\currentstreamlayer]
-%D       [preset=righttop]
-%D       [frame=off,
-%D        offset=overlay]
-%D       {\box\scratchbox}
-%D   \else
-%D     % more text than float
-%D     \setuplocalfloats
-%D       [before=\vfill,
-%D        after=\removedepth\vfill,
-%D        inbetween=\removedepth\vfill]
-%D     \setlayerframed
-%D       [\currentstreamlayer]
-%D       [preset=righttop]
-%D       [frame=off,
-%D        offset=overlay]
-%D       {\vbox to \thelayerheight\currentstreamlayer {\hsize\measure{localfloatwidth}\getlocalfloats}}
-%D   \fi
-%D   \resetlocalfloats
-%D \stopsetups
-%D
-%D \startsetups streamlayer:block:place
-%D   \setlayerframed
-%D     [\currentstreamlayer]
-%D     [preset=lefttop]
-%D     [frame=off,
-%D      offset=overlay]
-%D     {\outputstreambox[\currentstreamlayer]}%
-%D \stopsetups
-%D
-%D \startsetups streamlayer:block:flush
-%D    \framed
-%D      [offset=overlay,
-%D       frame=off,
-%D       background=color,
-%D       backgroundcolor=red]
-%D      {\tightlayer[\currentstreamlayer]}
-%D \stopsetups
-%D
-%D \setupbodyfont[small]
-%D
-%D \starttext
-%D
-%D \dorecurse {10} {
-%D     \startstreamlayer[block]
-%D         \title{Sample \recurselevel}
-%D         \input tufte \endgraf
-%D         \placefigure[local]{}{}
-%D         \placefigure[local]{}{}
-%D         \ifodd\recurselevel\relax \placefigure[local]{}{} \fi
-%D         \startitemize[columns]
-%D             \item xxx
-%D             \item xxx
-%D             \item xxx
-%D             \item xxx
-%D             \item xxx
-%D         \stopitemize
-%D     \stopstreamlayer
-%D     \placestreamlayer[block]
-%D }
-%D
-%D \dorecurse {10} {
-%D     \startstreamlayer[block]
-%D         \title{Sample \recurselevel}
-%D         \startcolumns
-%D             \input tufte
-%D         \stopcolumns
-%D     \stopstreamlayer
-%D     \placestreamlayer[block]
-%D }
-%D
-%D \stoptext
-%D \stoptyping
-
-\def\starttextstreamlayer
-  {\startstreamlayer}
-
-\def\stoptextstreamlayer
-  {\endgraf
-   % maybe depth if no proper depth and no skip
-   \removelastskip
-   \stopstreamlayer}
-
-\def\placetextstreamlayer{\placestreamlayer}
-
-%D \starttyping
-%D \definestreamlayer[whatever][width=12cm]
-%D
-%D \startstreamlayer[whatever]
-%D   \startitemize[columns,two][after=]
-%D     \item one
-%D     \item two
-%D     \item three
-%D     \item four
-%D   \stopitemize
-%D \stopstreamlayer
-%D
-%D \framed[strut=no,align=normal]{\placestreamlayer[whatever]\obeydepth}
-%D
-%D \starttextstreamlayer[whatever]
-%D   \startitemize[columns,two]
-%D     \item one
-%D     \item two
-%D     \item three
-%D     \item four
-%D   \stopitemize
-%D \stoptextstreamlayer
-%D
-%D \framed[strut=no]{\placetextstreamlayer[whatever]}
-%D \stoptyping
-
-\endinput
-
-\setupinterlinespace[top=height]
-
-\setupcolors[state=start]
-
-\definestreamlayer[block]
-
-\definemeasure[localtextwidth] [\dimexpr.7\textwidth\relax]
-\definemeasure[localfloatwidth][\dimexpr.3\textwidth-2\bodyfontsize\relax]
-
-\startsetups streamlayer:block:settings
-  \hsize=\measure{localtextwidth}
-  \setupfloat[figure][maxwidth=\measure{localfloatwidth}]
-\stopsetups
-
-\startsetups streamlayer:block:extras
-  \setuplocalfloats
-    [before=\whitespace\blank,
-     after=\whitespace\blank,
-     inbetween=\whitespace\blank]
-  \setbox\scratchbox\vbox{\hsize\measure{localfloatwidth}\getlocalfloats}
-  \ifdim\ht\scratchbox>\thelayerheight\currentstreamlayer\relax
-    % more float than text
-    \setlayerframed
-      [\currentstreamlayer]
-      [preset=righttop]
-      [frame=off,
-       offset=overlay]
-      {\box\scratchbox}
-  \else
-    % more text than float
-    \setuplocalfloats
-      [before=\vfill,
-       after=\removedepth\vfill,
-       inbetween=\removedepth\vfill]
-    \setlayerframed
-      [\currentstreamlayer]
-      [preset=righttop]
-      [frame=off,
-       offset=overlay]
-      {\vbox to \thelayerheight\currentstreamlayer {\hsize\measure{localfloatwidth}\getlocalfloats}}
-  \fi
-  \resetlocalfloats
-\stopsetups
-
-\startsetups streamlayer:block:place
-  \setlayerframed
-    [\currentstreamlayer]
-    [preset=lefttop]
-    [frame=off,
-     offset=overlay]
-    {\outputstreambox[\currentstreamlayer]}%
-\stopsetups
-
-\startsetups streamlayer:block:flush
-   \framed
-     [offset=overlay,
-      frame=off,
-      background=color,
-      backgroundcolor=red]
-     {\tightlayer[\currentstreamlayer]}
-\stopsetups
-
-\setupbodyfont[small]
-
-\starttext
-
-% \definestreamlayer[block]
-%
-% \startstreamlayer[block]
-%     \title{Sample \recurselevel}
-%     \startcolumns
-%         \dorecurse{4}{\input tufte \par}
-%     \stopcolumns
-% \stopstreamlayer
-% \placestreamlayer[block]
-
-\dorecurse {10} {
-    \startstreamlayer[block]
-        \title{Sample \recurselevel}
-        \input tufte \endgraf
-        \placefigure[local]{}{}
-        \placefigure[local]{}{}
-        \ifodd\recurselevel\relax \placefigure[local]{}{} \fi
-        \startitemize[columns]
-            \item xxx
-            \item xxx
-            \item xxx
-            \item xxx
-            \item xxx
-        \stopitemize
-    \stopstreamlayer
-    \placestreamlayer[block]
-}
-
-\dorecurse {10} {
-    \startstreamlayer[block]
-        \title{Sample \recurselevel}
-        \startcolumns
-            \input tufte
-        \stopcolumns
-    \stopstreamlayer
-    \placestreamlayer[block]
-}
-
-\stoptext
diff --git a/tex/context/base/anch-bar.mkii b/tex/context/base/mkii/anch-bar.mkii
index 39d5c7f77..39d5c7f77 100644
--- a/tex/context/base/anch-bar.mkii
+++ b/tex/context/base/mkii/anch-bar.mkii
diff --git a/tex/context/base/anch-pgr.mkii b/tex/context/base/mkii/anch-pgr.mkii
index 4ceea844c..4ceea844c 100644
--- a/tex/context/base/anch-pgr.mkii
+++ b/tex/context/base/mkii/anch-pgr.mkii
diff --git a/tex/context/base/anch-pos.mkii b/tex/context/base/mkii/anch-pos.mkii
index b86cee5cc..b86cee5cc 100644
--- a/tex/context/base/anch-pos.mkii
+++ b/tex/context/base/mkii/anch-pos.mkii
diff --git a/tex/context/base/anch-snc.mkii b/tex/context/base/mkii/anch-snc.mkii
index 01704e0c8..01704e0c8 100644
--- a/tex/context/base/anch-snc.mkii
+++ b/tex/context/base/mkii/anch-snc.mkii
diff --git a/tex/context/base/bibl-tra.mkii b/tex/context/base/mkii/bibl-tra.mkii
index 868ca0fc6..868ca0fc6 100644
--- a/tex/context/base/bibl-tra.mkii
+++ b/tex/context/base/mkii/bibl-tra.mkii
diff --git a/tex/context/base/buff-ini.mkii b/tex/context/base/mkii/buff-ini.mkii
index 7fdb89e45..7fdb89e45 100644
--- a/tex/context/base/buff-ini.mkii
+++ b/tex/context/base/mkii/buff-ini.mkii
diff --git a/tex/context/base/buff-ver.mkii b/tex/context/base/mkii/buff-ver.mkii
index fbe56892e..fbe56892e 100644
--- a/tex/context/base/buff-ver.mkii
+++ b/tex/context/base/mkii/buff-ver.mkii
diff --git a/tex/context/base/catc-act.mkii b/tex/context/base/mkii/catc-act.mkii
index 6535afc56..6535afc56 100644
--- a/tex/context/base/catc-act.mkii
+++ b/tex/context/base/mkii/catc-act.mkii
diff --git a/tex/context/base/catc-ctx.mkii b/tex/context/base/mkii/catc-ctx.mkii
index 8bb43c1f9..8bb43c1f9 100644
--- a/tex/context/base/catc-ctx.mkii
+++ b/tex/context/base/mkii/catc-ctx.mkii
diff --git a/tex/context/base/catc-def.mkii b/tex/context/base/mkii/catc-def.mkii
index 25044bdf0..25044bdf0 100644
--- a/tex/context/base/catc-def.mkii
+++ b/tex/context/base/mkii/catc-def.mkii
diff --git a/tex/context/base/catc-ini.mkii b/tex/context/base/mkii/catc-ini.mkii
index 7527466e1..7527466e1 100644
--- a/tex/context/base/catc-ini.mkii
+++ b/tex/context/base/mkii/catc-ini.mkii
diff --git a/tex/context/base/catc-sym.mkii b/tex/context/base/mkii/catc-sym.mkii
index 55782f11e..55782f11e 100644
--- a/tex/context/base/catc-sym.mkii
+++ b/tex/context/base/mkii/catc-sym.mkii
diff --git a/tex/context/base/catc-xml.mkii b/tex/context/base/mkii/catc-xml.mkii
index 45eb5a421..45eb5a421 100644
--- a/tex/context/base/catc-xml.mkii
+++ b/tex/context/base/mkii/catc-xml.mkii
diff --git a/tex/context/base/colo-ema.mkii b/tex/context/base/mkii/colo-ema.mkii
index 11d76f342..11d76f342 100644
--- a/tex/context/base/colo-ema.mkii
+++ b/tex/context/base/mkii/colo-ema.mkii
diff --git a/tex/context/base/colo-ext.mkii b/tex/context/base/mkii/colo-ext.mkii
index 5b39a8e85..5b39a8e85 100644
--- a/tex/context/base/colo-ext.mkii
+++ b/tex/context/base/mkii/colo-ext.mkii
diff --git a/tex/context/base/colo-hex.mkii b/tex/context/base/mkii/colo-hex.mkii
index ddf2d4706..ddf2d4706 100644
--- a/tex/context/base/colo-hex.mkii
+++ b/tex/context/base/mkii/colo-hex.mkii
diff --git a/tex/context/base/colo-ini.mkii b/tex/context/base/mkii/colo-ini.mkii
index 56b9d14da..56b9d14da 100644
--- a/tex/context/base/colo-ini.mkii
+++ b/tex/context/base/mkii/colo-ini.mkii
diff --git a/tex/context/base/colo-rgb.mkii b/tex/context/base/mkii/colo-rgb.mkii
index f734c7a01..f734c7a01 100644
--- a/tex/context/base/colo-rgb.mkii
+++ b/tex/context/base/mkii/colo-rgb.mkii
diff --git a/tex/context/base/colo-run.mkii b/tex/context/base/mkii/colo-run.mkii
index 02da462d3..02da462d3 100644
--- a/tex/context/base/colo-run.mkii
+++ b/tex/context/base/mkii/colo-run.mkii
diff --git a/tex/context/base/colo-x11.mkii b/tex/context/base/mkii/colo-x11.mkii
index 45d3aac62..45d3aac62 100644
--- a/tex/context/base/colo-x11.mkii
+++ b/tex/context/base/mkii/colo-x11.mkii
diff --git a/tex/context/base/colo-xwi.mkii b/tex/context/base/mkii/colo-xwi.mkii
index 13d04759e..13d04759e 100644
--- a/tex/context/base/colo-xwi.mkii
+++ b/tex/context/base/mkii/colo-xwi.mkii
diff --git a/tex/context/base/cont-cs.mkii b/tex/context/base/mkii/cont-cs.mkii
index 89b781c37..89b781c37 100644
--- a/tex/context/base/cont-cs.mkii
+++ b/tex/context/base/mkii/cont-cs.mkii
diff --git a/tex/context/base/cont-de.mkii b/tex/context/base/mkii/cont-de.mkii
index 5badc59d0..5badc59d0 100644
--- a/tex/context/base/cont-de.mkii
+++ b/tex/context/base/mkii/cont-de.mkii
diff --git a/tex/context/base/cont-en.mkii b/tex/context/base/mkii/cont-en.mkii
index 9d0d4de2e..9d0d4de2e 100644
--- a/tex/context/base/cont-en.mkii
+++ b/tex/context/base/mkii/cont-en.mkii
diff --git a/tex/context/base/cont-err.mkii b/tex/context/base/mkii/cont-err.mkii
index 00118f6cc..00118f6cc 100644
--- a/tex/context/base/cont-err.mkii
+++ b/tex/context/base/mkii/cont-err.mkii
diff --git a/tex/context/base/cont-fil.mkii b/tex/context/base/mkii/cont-fil.mkii
index 604ea233d..604ea233d 100644
--- a/tex/context/base/cont-fil.mkii
+++ b/tex/context/base/mkii/cont-fil.mkii
diff --git a/tex/context/base/cont-fr.mkii b/tex/context/base/mkii/cont-fr.mkii
index e70cfe65e..e70cfe65e 100644
--- a/tex/context/base/cont-fr.mkii
+++ b/tex/context/base/mkii/cont-fr.mkii
diff --git a/tex/context/base/cont-gb.mkii b/tex/context/base/mkii/cont-gb.mkii
index 5cd0a9635..5cd0a9635 100644
--- a/tex/context/base/cont-gb.mkii
+++ b/tex/context/base/mkii/cont-gb.mkii
diff --git a/tex/context/base/cont-it.mkii b/tex/context/base/mkii/cont-it.mkii
index f15171403..f15171403 100644
--- a/tex/context/base/cont-it.mkii
+++ b/tex/context/base/mkii/cont-it.mkii
diff --git a/tex/context/base/cont-log.mkii b/tex/context/base/mkii/cont-log.mkii
index 6a7a70795..6a7a70795 100644
--- a/tex/context/base/cont-log.mkii
+++ b/tex/context/base/mkii/cont-log.mkii
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index f0385c065..f0385c065 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
diff --git a/tex/context/base/cont-nl.mkii b/tex/context/base/mkii/cont-nl.mkii
index f9cefaaac..f9cefaaac 100644
--- a/tex/context/base/cont-nl.mkii
+++ b/tex/context/base/mkii/cont-nl.mkii
diff --git a/tex/context/base/cont-ro.mkii b/tex/context/base/mkii/cont-ro.mkii
index d68cf5a45..d68cf5a45 100644
--- a/tex/context/base/cont-ro.mkii
+++ b/tex/context/base/mkii/cont-ro.mkii
diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/mkii/cont-sys.ori
index fa438a78d..fa438a78d 100644
--- a/tex/context/base/cont-sys.ori
+++ b/tex/context/base/mkii/cont-sys.ori
diff --git a/tex/context/base/context.mkii b/tex/context/base/mkii/context.mkii
index 84679a9a2..84679a9a2 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/mkii/context.mkii
diff --git a/tex/context/base/core-con.mkii b/tex/context/base/mkii/core-con.mkii
index 46fbe9b9e..46fbe9b9e 100644
--- a/tex/context/base/core-con.mkii
+++ b/tex/context/base/mkii/core-con.mkii
diff --git a/tex/context/base/core-ctx.mkii b/tex/context/base/mkii/core-ctx.mkii
index c693d10db..c693d10db 100644
--- a/tex/context/base/core-ctx.mkii
+++ b/tex/context/base/mkii/core-ctx.mkii
diff --git a/tex/context/base/core-def.mkii b/tex/context/base/mkii/core-def.mkii
index 971e8953d..971e8953d 100644
--- a/tex/context/base/core-def.mkii
+++ b/tex/context/base/mkii/core-def.mkii
diff --git a/tex/context/base/core-env.mkii b/tex/context/base/mkii/core-env.mkii
index 6058c4c9f..6058c4c9f 100644
--- a/tex/context/base/core-env.mkii
+++ b/tex/context/base/mkii/core-env.mkii
diff --git a/tex/context/base/core-fil.mkii b/tex/context/base/mkii/core-fil.mkii
index 16daf7bf6..16daf7bf6 100644
--- a/tex/context/base/core-fil.mkii
+++ b/tex/context/base/mkii/core-fil.mkii
diff --git a/tex/context/base/core-fnt.mkii b/tex/context/base/mkii/core-fnt.mkii
index 542ca062a..542ca062a 100644
--- a/tex/context/base/core-fnt.mkii
+++ b/tex/context/base/mkii/core-fnt.mkii
diff --git a/tex/context/base/core-gen.mkii b/tex/context/base/mkii/core-gen.mkii
index 0d7fcebe0..0d7fcebe0 100644
--- a/tex/context/base/core-gen.mkii
+++ b/tex/context/base/mkii/core-gen.mkii
diff --git a/tex/context/base/core-ini.mkii b/tex/context/base/mkii/core-ini.mkii
index 04535bec6..04535bec6 100644
--- a/tex/context/base/core-ini.mkii
+++ b/tex/context/base/mkii/core-ini.mkii
diff --git a/tex/context/base/core-job.mkii b/tex/context/base/mkii/core-job.mkii
index e2dc16031..e2dc16031 100644
--- a/tex/context/base/core-job.mkii
+++ b/tex/context/base/mkii/core-job.mkii
diff --git a/tex/context/base/core-mis.mkii b/tex/context/base/mkii/core-mis.mkii
index c44d61cbc..c44d61cbc 100644
--- a/tex/context/base/core-mis.mkii
+++ b/tex/context/base/mkii/core-mis.mkii
diff --git a/tex/context/base/core-par.mkii b/tex/context/base/mkii/core-par.mkii
index 69e2976d1..69e2976d1 100644
--- a/tex/context/base/core-par.mkii
+++ b/tex/context/base/mkii/core-par.mkii
diff --git a/tex/context/base/core-stg.mkii b/tex/context/base/mkii/core-stg.mkii
index 0d98da851..0d98da851 100644
--- a/tex/context/base/core-stg.mkii
+++ b/tex/context/base/mkii/core-stg.mkii
diff --git a/tex/context/base/core-sys.mkii b/tex/context/base/mkii/core-sys.mkii
index 54778eeed..54778eeed 100644
--- a/tex/context/base/core-sys.mkii
+++ b/tex/context/base/mkii/core-sys.mkii
diff --git a/tex/context/base/core-two.mkii b/tex/context/base/mkii/core-two.mkii
index 235be988e..235be988e 100644
--- a/tex/context/base/core-two.mkii
+++ b/tex/context/base/mkii/core-two.mkii
diff --git a/tex/context/base/core-uti.mkii b/tex/context/base/mkii/core-uti.mkii
index bd2fa46a0..bd2fa46a0 100644
--- a/tex/context/base/core-uti.mkii
+++ b/tex/context/base/mkii/core-uti.mkii
diff --git a/tex/context/base/core-var.mkii b/tex/context/base/mkii/core-var.mkii
index 55c587fbf..55c587fbf 100644
--- a/tex/context/base/core-var.mkii
+++ b/tex/context/base/mkii/core-var.mkii
diff --git a/tex/context/base/enco-032.mkii b/tex/context/base/mkii/enco-032.mkii
index e3c24271e..e3c24271e 100644
--- a/tex/context/base/enco-032.mkii
+++ b/tex/context/base/mkii/enco-032.mkii
diff --git a/tex/context/base/enco-037.mkii b/tex/context/base/mkii/enco-037.mkii
index a2aad46a5..a2aad46a5 100644
--- a/tex/context/base/enco-037.mkii
+++ b/tex/context/base/mkii/enco-037.mkii
diff --git a/tex/context/base/enco-acc.mkii b/tex/context/base/mkii/enco-acc.mkii
index 7484fd50e..7484fd50e 100644
--- a/tex/context/base/enco-acc.mkii
+++ b/tex/context/base/mkii/enco-acc.mkii
diff --git a/tex/context/base/enco-agr.mkii b/tex/context/base/mkii/enco-agr.mkii
index 1dbb9b577..1dbb9b577 100644
--- a/tex/context/base/enco-agr.mkii
+++ b/tex/context/base/mkii/enco-agr.mkii
diff --git a/tex/context/base/enco-ans.mkii b/tex/context/base/mkii/enco-ans.mkii
index c71b2451a..c71b2451a 100644
--- a/tex/context/base/enco-ans.mkii
+++ b/tex/context/base/mkii/enco-ans.mkii
diff --git a/tex/context/base/enco-cas.mkii b/tex/context/base/mkii/enco-cas.mkii
index 6ac35eb32..6ac35eb32 100644
--- a/tex/context/base/enco-cas.mkii
+++ b/tex/context/base/mkii/enco-cas.mkii
diff --git a/tex/context/base/enco-chi.mkii b/tex/context/base/mkii/enco-chi.mkii
index 727720565..727720565 100644
--- a/tex/context/base/enco-chi.mkii
+++ b/tex/context/base/mkii/enco-chi.mkii
diff --git a/tex/context/base/enco-com.mkii b/tex/context/base/mkii/enco-com.mkii
index 620ac0c96..620ac0c96 100644
--- a/tex/context/base/enco-com.mkii
+++ b/tex/context/base/mkii/enco-com.mkii
diff --git a/tex/context/base/enco-cyr.mkii b/tex/context/base/mkii/enco-cyr.mkii
index aa412d8d3..aa412d8d3 100644
--- a/tex/context/base/enco-cyr.mkii
+++ b/tex/context/base/mkii/enco-cyr.mkii
diff --git a/tex/context/base/enco-def.mkii b/tex/context/base/mkii/enco-def.mkii
index 20c885d4d..20c885d4d 100644
--- a/tex/context/base/enco-def.mkii
+++ b/tex/context/base/mkii/enco-def.mkii
diff --git a/tex/context/base/enco-ec.mkii b/tex/context/base/mkii/enco-ec.mkii
index 918c85e12..918c85e12 100644
--- a/tex/context/base/enco-ec.mkii
+++ b/tex/context/base/mkii/enco-ec.mkii
diff --git a/tex/context/base/enco-ecm.mkii b/tex/context/base/mkii/enco-ecm.mkii
index 8a9706574..8a9706574 100644
--- a/tex/context/base/enco-ecm.mkii
+++ b/tex/context/base/mkii/enco-ecm.mkii
diff --git a/tex/context/base/enco-el.mkii b/tex/context/base/mkii/enco-el.mkii
index f268dcb3c..f268dcb3c 100644
--- a/tex/context/base/enco-el.mkii
+++ b/tex/context/base/mkii/enco-el.mkii
diff --git a/tex/context/base/enco-fde.mkii b/tex/context/base/mkii/enco-fde.mkii
index 57e572c04..57e572c04 100644
--- a/tex/context/base/enco-fde.mkii
+++ b/tex/context/base/mkii/enco-fde.mkii
diff --git a/tex/context/base/enco-ffr.mkii b/tex/context/base/mkii/enco-ffr.mkii
index 7e605bb05..7e605bb05 100644
--- a/tex/context/base/enco-ffr.mkii
+++ b/tex/context/base/mkii/enco-ffr.mkii
diff --git a/tex/context/base/enco-fpl.mkii b/tex/context/base/mkii/enco-fpl.mkii
index ddf865698..ddf865698 100644
--- a/tex/context/base/enco-fpl.mkii
+++ b/tex/context/base/mkii/enco-fpl.mkii
diff --git a/tex/context/base/enco-fro.mkii b/tex/context/base/mkii/enco-fro.mkii
index af1272163..af1272163 100644
--- a/tex/context/base/enco-fro.mkii
+++ b/tex/context/base/mkii/enco-fro.mkii
diff --git a/tex/context/base/enco-fsl.mkii b/tex/context/base/mkii/enco-fsl.mkii
index 8fbca98ca..8fbca98ca 100644
--- a/tex/context/base/enco-fsl.mkii
+++ b/tex/context/base/mkii/enco-fsl.mkii
diff --git a/tex/context/base/enco-grk.mkii b/tex/context/base/mkii/enco-grk.mkii
index 6264f362e..6264f362e 100644
--- a/tex/context/base/enco-grk.mkii
+++ b/tex/context/base/mkii/enco-grk.mkii
diff --git a/tex/context/base/enco-heb.mkii b/tex/context/base/mkii/enco-heb.mkii
index a4ef2cd2c..a4ef2cd2c 100644
--- a/tex/context/base/enco-heb.mkii
+++ b/tex/context/base/mkii/enco-heb.mkii
diff --git a/tex/context/base/enco-ibm.mkii b/tex/context/base/mkii/enco-ibm.mkii
index 48695ca52..48695ca52 100644
--- a/tex/context/base/enco-ibm.mkii
+++ b/tex/context/base/mkii/enco-ibm.mkii
diff --git a/tex/context/base/enco-il2.mkii b/tex/context/base/mkii/enco-il2.mkii
index 9b08dc897..9b08dc897 100644
--- a/tex/context/base/enco-il2.mkii
+++ b/tex/context/base/mkii/enco-il2.mkii
diff --git a/tex/context/base/enco-ini.mkii b/tex/context/base/mkii/enco-ini.mkii
index 8603f2420..8603f2420 100644
--- a/tex/context/base/enco-ini.mkii
+++ b/tex/context/base/mkii/enco-ini.mkii
diff --git a/tex/context/base/enco-l7x.mkii b/tex/context/base/mkii/enco-l7x.mkii
index 2a0d12c9f..2a0d12c9f 100644
--- a/tex/context/base/enco-l7x.mkii
+++ b/tex/context/base/mkii/enco-l7x.mkii
diff --git a/tex/context/base/enco-lat.mkii b/tex/context/base/mkii/enco-lat.mkii
index 2623aae8d..2623aae8d 100644
--- a/tex/context/base/enco-lat.mkii
+++ b/tex/context/base/mkii/enco-lat.mkii
diff --git a/tex/context/base/enco-mis.mkii b/tex/context/base/mkii/enco-mis.mkii
index 28523685e..28523685e 100644
--- a/tex/context/base/enco-mis.mkii
+++ b/tex/context/base/mkii/enco-mis.mkii
diff --git a/tex/context/base/enco-pdf.mkii b/tex/context/base/mkii/enco-pdf.mkii
index 28e960673..28e960673 100644
--- a/tex/context/base/enco-pdf.mkii
+++ b/tex/context/base/mkii/enco-pdf.mkii
diff --git a/tex/context/base/enco-pfr.mkii b/tex/context/base/mkii/enco-pfr.mkii
index aca2436c1..aca2436c1 100644
--- a/tex/context/base/enco-pfr.mkii
+++ b/tex/context/base/mkii/enco-pfr.mkii
diff --git a/tex/context/base/enco-pol.mkii b/tex/context/base/mkii/enco-pol.mkii
index ec49c6e1d..ec49c6e1d 100644
--- a/tex/context/base/enco-pol.mkii
+++ b/tex/context/base/mkii/enco-pol.mkii
diff --git a/tex/context/base/enco-qx.mkii b/tex/context/base/mkii/enco-qx.mkii
index b184fe0ac..b184fe0ac 100644
--- a/tex/context/base/enco-qx.mkii
+++ b/tex/context/base/mkii/enco-qx.mkii
diff --git a/tex/context/base/enco-raw.mkii b/tex/context/base/mkii/enco-raw.mkii
index e3a46e3d7..e3a46e3d7 100644
--- a/tex/context/base/enco-raw.mkii
+++ b/tex/context/base/mkii/enco-raw.mkii
diff --git a/tex/context/base/enco-run.mkii b/tex/context/base/mkii/enco-run.mkii
index 2f60a35b8..2f60a35b8 100644
--- a/tex/context/base/enco-run.mkii
+++ b/tex/context/base/mkii/enco-run.mkii
diff --git a/tex/context/base/enco-t5.mkii b/tex/context/base/mkii/enco-t5.mkii
index 3f51b8585..3f51b8585 100644
--- a/tex/context/base/enco-t5.mkii
+++ b/tex/context/base/mkii/enco-t5.mkii
diff --git a/tex/context/base/enco-tbo.mkii b/tex/context/base/mkii/enco-tbo.mkii
index 5733acd32..5733acd32 100644
--- a/tex/context/base/enco-tbo.mkii
+++ b/tex/context/base/mkii/enco-tbo.mkii
diff --git a/tex/context/base/enco-uc.mkii b/tex/context/base/mkii/enco-uc.mkii
index 0be22318a..0be22318a 100644
--- a/tex/context/base/enco-uc.mkii
+++ b/tex/context/base/mkii/enco-uc.mkii
diff --git a/tex/context/base/enco-vis.mkii b/tex/context/base/mkii/enco-vis.mkii
index 3c1fd7765..3c1fd7765 100644
--- a/tex/context/base/enco-vis.mkii
+++ b/tex/context/base/mkii/enco-vis.mkii
diff --git a/tex/context/base/enco-vna.mkii b/tex/context/base/mkii/enco-vna.mkii
index 42fee4341..42fee4341 100644
--- a/tex/context/base/enco-vna.mkii
+++ b/tex/context/base/mkii/enco-vna.mkii
diff --git a/tex/context/base/enco-win.mkii b/tex/context/base/mkii/enco-win.mkii
index 826371d8a..826371d8a 100644
--- a/tex/context/base/enco-win.mkii
+++ b/tex/context/base/mkii/enco-win.mkii
diff --git a/tex/context/base/enco-x5.mkii b/tex/context/base/mkii/enco-x5.mkii
index cde394e29..cde394e29 100644
--- a/tex/context/base/enco-x5.mkii
+++ b/tex/context/base/mkii/enco-x5.mkii
diff --git a/tex/context/base/filt-bas.mkii b/tex/context/base/mkii/filt-bas.mkii
index fedeb694b..fedeb694b 100644
--- a/tex/context/base/filt-bas.mkii
+++ b/tex/context/base/mkii/filt-bas.mkii
diff --git a/tex/context/base/filt-ini.mkii b/tex/context/base/mkii/filt-ini.mkii
index f2f59349a..f2f59349a 100644
--- a/tex/context/base/filt-ini.mkii
+++ b/tex/context/base/mkii/filt-ini.mkii
diff --git a/tex/context/base/font-arb.mkii b/tex/context/base/mkii/font-arb.mkii
index 3ec0395f3..3ec0395f3 100644
--- a/tex/context/base/font-arb.mkii
+++ b/tex/context/base/mkii/font-arb.mkii
diff --git a/tex/context/base/font-bfm.mkii b/tex/context/base/mkii/font-bfm.mkii
index 0a25ec742..0a25ec742 100644
--- a/tex/context/base/font-bfm.mkii
+++ b/tex/context/base/mkii/font-bfm.mkii
diff --git a/tex/context/base/font-chi.mkii b/tex/context/base/mkii/font-chi.mkii
index 5e5457227..5e5457227 100644
--- a/tex/context/base/font-chi.mkii
+++ b/tex/context/base/mkii/font-chi.mkii
diff --git a/tex/context/base/font-heb.mkii b/tex/context/base/mkii/font-heb.mkii
index 3ec0395f3..3ec0395f3 100644
--- a/tex/context/base/font-heb.mkii
+++ b/tex/context/base/mkii/font-heb.mkii
diff --git a/tex/context/base/font-ini.mkii b/tex/context/base/mkii/font-ini.mkii
index 2bee00637..2bee00637 100644
--- a/tex/context/base/font-ini.mkii
+++ b/tex/context/base/mkii/font-ini.mkii
diff --git a/tex/context/base/font-jap.mkii b/tex/context/base/mkii/font-jap.mkii
index b8aa3d836..b8aa3d836 100644
--- a/tex/context/base/font-jap.mkii
+++ b/tex/context/base/mkii/font-jap.mkii
diff --git a/tex/context/base/font-run.mkii b/tex/context/base/mkii/font-run.mkii
index 04fcd576a..04fcd576a 100644
--- a/tex/context/base/font-run.mkii
+++ b/tex/context/base/mkii/font-run.mkii
diff --git a/tex/context/base/font-uni.mkii b/tex/context/base/mkii/font-uni.mkii
index 77eb680e2..77eb680e2 100644
--- a/tex/context/base/font-uni.mkii
+++ b/tex/context/base/mkii/font-uni.mkii
diff --git a/tex/context/base/font-unk.mkii b/tex/context/base/mkii/font-unk.mkii
index 241369f68..241369f68 100644
--- a/tex/context/base/font-unk.mkii
+++ b/tex/context/base/mkii/font-unk.mkii
diff --git a/tex/context/base/font-xtx.mkii b/tex/context/base/mkii/font-xtx.mkii
index e7a6c8d80..e7a6c8d80 100644
--- a/tex/context/base/font-xtx.mkii
+++ b/tex/context/base/mkii/font-xtx.mkii
diff --git a/tex/context/base/grph-fig.mkii b/tex/context/base/mkii/grph-fig.mkii
index c488ccc4f..c488ccc4f 100644
--- a/tex/context/base/grph-fig.mkii
+++ b/tex/context/base/mkii/grph-fig.mkii
diff --git a/tex/context/base/grph-inc.mkii b/tex/context/base/mkii/grph-inc.mkii
index 33f11a2bc..33f11a2bc 100644
--- a/tex/context/base/grph-inc.mkii
+++ b/tex/context/base/mkii/grph-inc.mkii
diff --git a/tex/context/base/grph-trf.mkii b/tex/context/base/mkii/grph-trf.mkii
index bd9875806..bd9875806 100644
--- a/tex/context/base/grph-trf.mkii
+++ b/tex/context/base/mkii/grph-trf.mkii
diff --git a/tex/context/base/hand-def.mkii b/tex/context/base/mkii/hand-def.mkii
index ab0044a8e..ab0044a8e 100644
--- a/tex/context/base/hand-def.mkii
+++ b/tex/context/base/mkii/hand-def.mkii
diff --git a/tex/context/base/hand-ini.mkii b/tex/context/base/mkii/hand-ini.mkii
index 1d41c3ada..1d41c3ada 100644
--- a/tex/context/base/hand-ini.mkii
+++ b/tex/context/base/mkii/hand-ini.mkii
diff --git a/tex/context/base/java-ans.mkii b/tex/context/base/mkii/java-ans.mkii
index 7e310baa4..7e310baa4 100644
--- a/tex/context/base/java-ans.mkii
+++ b/tex/context/base/mkii/java-ans.mkii
diff --git a/tex/context/base/java-exa.mkii b/tex/context/base/mkii/java-exa.mkii
index 584ee1351..584ee1351 100644
--- a/tex/context/base/java-exa.mkii
+++ b/tex/context/base/mkii/java-exa.mkii
diff --git a/tex/context/base/java-fil.mkii b/tex/context/base/mkii/java-fil.mkii
index 20376af44..20376af44 100644
--- a/tex/context/base/java-fil.mkii
+++ b/tex/context/base/mkii/java-fil.mkii
diff --git a/tex/context/base/java-fld.mkii b/tex/context/base/mkii/java-fld.mkii
index 0a76cc93c..0a76cc93c 100644
--- a/tex/context/base/java-fld.mkii
+++ b/tex/context/base/mkii/java-fld.mkii
diff --git a/tex/context/base/java-ini.mkii b/tex/context/base/mkii/java-ini.mkii
index 2e62ca166..2e62ca166 100644
--- a/tex/context/base/java-ini.mkii
+++ b/tex/context/base/mkii/java-ini.mkii
diff --git a/tex/context/base/java-stp.mkii b/tex/context/base/mkii/java-stp.mkii
index 7283c8ceb..7283c8ceb 100644
--- a/tex/context/base/java-stp.mkii
+++ b/tex/context/base/mkii/java-stp.mkii
diff --git a/tex/context/base/lang-alt.mkii b/tex/context/base/mkii/lang-alt.mkii
index 1e49945d5..1e49945d5 100644
--- a/tex/context/base/lang-alt.mkii
+++ b/tex/context/base/mkii/lang-alt.mkii
diff --git a/tex/context/base/lang-ana.mkii b/tex/context/base/mkii/lang-ana.mkii
index f2dc4a17c..f2dc4a17c 100644
--- a/tex/context/base/lang-ana.mkii
+++ b/tex/context/base/mkii/lang-ana.mkii
diff --git a/tex/context/base/lang-art.mkii b/tex/context/base/mkii/lang-art.mkii
index 20216b571..20216b571 100644
--- a/tex/context/base/lang-art.mkii
+++ b/tex/context/base/mkii/lang-art.mkii
diff --git a/tex/context/base/lang-bal.mkii b/tex/context/base/mkii/lang-bal.mkii
index 4ab751a44..4ab751a44 100644
--- a/tex/context/base/lang-bal.mkii
+++ b/tex/context/base/mkii/lang-bal.mkii
diff --git a/tex/context/base/lang-cel.mkii b/tex/context/base/mkii/lang-cel.mkii
index e6519497b..e6519497b 100644
--- a/tex/context/base/lang-cel.mkii
+++ b/tex/context/base/mkii/lang-cel.mkii
diff --git a/tex/context/base/lang-chi.mkii b/tex/context/base/mkii/lang-chi.mkii
index 5d61281b0..5d61281b0 100644
--- a/tex/context/base/lang-chi.mkii
+++ b/tex/context/base/mkii/lang-chi.mkii
diff --git a/tex/context/base/lang-ctx.mkii b/tex/context/base/mkii/lang-ctx.mkii
index 2aecb918e..2aecb918e 100644
--- a/tex/context/base/lang-ctx.mkii
+++ b/tex/context/base/mkii/lang-ctx.mkii
diff --git a/tex/context/base/lang-cyr.mkii b/tex/context/base/mkii/lang-cyr.mkii
index eed3ec80e..eed3ec80e 100644
--- a/tex/context/base/lang-cyr.mkii
+++ b/tex/context/base/mkii/lang-cyr.mkii
diff --git a/tex/context/base/lang-dis.mkii b/tex/context/base/mkii/lang-dis.mkii
index 213c5110f..213c5110f 100644
--- a/tex/context/base/lang-dis.mkii
+++ b/tex/context/base/mkii/lang-dis.mkii
diff --git a/tex/context/base/lang-frd.mkii b/tex/context/base/mkii/lang-frd.mkii
index be4e07b75..be4e07b75 100644
--- a/tex/context/base/lang-frd.mkii
+++ b/tex/context/base/mkii/lang-frd.mkii
diff --git a/tex/context/base/lang-frq.mkii b/tex/context/base/mkii/lang-frq.mkii
index afeb5329c..afeb5329c 100644
--- a/tex/context/base/lang-frq.mkii
+++ b/tex/context/base/mkii/lang-frq.mkii
diff --git a/tex/context/base/lang-ger.mkii b/tex/context/base/mkii/lang-ger.mkii
index d33620cc7..d33620cc7 100644
--- a/tex/context/base/lang-ger.mkii
+++ b/tex/context/base/mkii/lang-ger.mkii
diff --git a/tex/context/base/lang-grk.mkii b/tex/context/base/mkii/lang-grk.mkii
index 9fd59382a..9fd59382a 100644
--- a/tex/context/base/lang-grk.mkii
+++ b/tex/context/base/mkii/lang-grk.mkii
diff --git a/tex/context/base/lang-ind.mkii b/tex/context/base/mkii/lang-ind.mkii
index bb33dacfd..bb33dacfd 100644
--- a/tex/context/base/lang-ind.mkii
+++ b/tex/context/base/mkii/lang-ind.mkii
diff --git a/tex/context/base/lang-ini.mkii b/tex/context/base/mkii/lang-ini.mkii
index 4561f4dd1..4561f4dd1 100644
--- a/tex/context/base/lang-ini.mkii
+++ b/tex/context/base/mkii/lang-ini.mkii
diff --git a/tex/context/base/lang-ita.mkii b/tex/context/base/mkii/lang-ita.mkii
index 04acf3265..04acf3265 100644
--- a/tex/context/base/lang-ita.mkii
+++ b/tex/context/base/mkii/lang-ita.mkii
diff --git a/tex/context/base/lang-jap.mkii b/tex/context/base/mkii/lang-jap.mkii
index 1417e8ec5..1417e8ec5 100644
--- a/tex/context/base/lang-jap.mkii
+++ b/tex/context/base/mkii/lang-jap.mkii
diff --git a/tex/context/base/lang-lab.mkii b/tex/context/base/mkii/lang-lab.mkii
index 1ff964615..1ff964615 100644
--- a/tex/context/base/lang-lab.mkii
+++ b/tex/context/base/mkii/lang-lab.mkii
diff --git a/tex/context/base/lang-mis.mkii b/tex/context/base/mkii/lang-mis.mkii
index 3923df3e8..3923df3e8 100644
--- a/tex/context/base/lang-mis.mkii
+++ b/tex/context/base/mkii/lang-mis.mkii
diff --git a/tex/context/base/lang-run.mkii b/tex/context/base/mkii/lang-run.mkii
index 320ee8dab..320ee8dab 100644
--- a/tex/context/base/lang-run.mkii
+++ b/tex/context/base/mkii/lang-run.mkii
diff --git a/tex/context/base/lang-sla.mkii b/tex/context/base/mkii/lang-sla.mkii
index 81f9a9bf7..81f9a9bf7 100644
--- a/tex/context/base/lang-sla.mkii
+++ b/tex/context/base/mkii/lang-sla.mkii
diff --git a/tex/context/base/lang-spa.mkii b/tex/context/base/mkii/lang-spa.mkii
index 313e5f3e6..313e5f3e6 100644
--- a/tex/context/base/lang-spa.mkii
+++ b/tex/context/base/mkii/lang-spa.mkii
diff --git a/tex/context/base/lang-spe.mkii b/tex/context/base/mkii/lang-spe.mkii
index 11c57af3f..11c57af3f 100644
--- a/tex/context/base/lang-spe.mkii
+++ b/tex/context/base/mkii/lang-spe.mkii
diff --git a/tex/context/base/lang-ura.mkii b/tex/context/base/mkii/lang-ura.mkii
index 21bc8d94a..21bc8d94a 100644
--- a/tex/context/base/lang-ura.mkii
+++ b/tex/context/base/mkii/lang-ura.mkii
diff --git a/tex/context/base/lang-url.mkii b/tex/context/base/mkii/lang-url.mkii
index 1f340ffb0..1f340ffb0 100644
--- a/tex/context/base/lang-url.mkii
+++ b/tex/context/base/mkii/lang-url.mkii
diff --git a/tex/context/base/lang-vn.mkii b/tex/context/base/mkii/lang-vn.mkii
index e564d989c..e564d989c 100644
--- a/tex/context/base/lang-vn.mkii
+++ b/tex/context/base/mkii/lang-vn.mkii
diff --git a/tex/context/base/math-ams.mkii b/tex/context/base/mkii/math-ams.mkii
index c73a890c0..c73a890c0 100644
--- a/tex/context/base/math-ams.mkii
+++ b/tex/context/base/mkii/math-ams.mkii
diff --git a/tex/context/base/math-arr.mkii b/tex/context/base/mkii/math-arr.mkii
index 71a833b89..71a833b89 100644
--- a/tex/context/base/math-arr.mkii
+++ b/tex/context/base/mkii/math-arr.mkii
diff --git a/tex/context/base/math-cow.mkii b/tex/context/base/mkii/math-cow.mkii
index 04f659b44..04f659b44 100644
--- a/tex/context/base/math-cow.mkii
+++ b/tex/context/base/mkii/math-cow.mkii
diff --git a/tex/context/base/math-eul.mkii b/tex/context/base/mkii/math-eul.mkii
index f50244525..f50244525 100644
--- a/tex/context/base/math-eul.mkii
+++ b/tex/context/base/mkii/math-eul.mkii
diff --git a/tex/context/base/math-fou.mkii b/tex/context/base/mkii/math-fou.mkii
index 26b03d73e..26b03d73e 100644
--- a/tex/context/base/math-fou.mkii
+++ b/tex/context/base/mkii/math-fou.mkii
diff --git a/tex/context/base/math-frc.mkii b/tex/context/base/mkii/math-frc.mkii
index b14c93774..b14c93774 100644
--- a/tex/context/base/math-frc.mkii
+++ b/tex/context/base/mkii/math-frc.mkii
diff --git a/tex/context/base/math-ini.mkii b/tex/context/base/mkii/math-ini.mkii
index d6d10feb3..d6d10feb3 100644
--- a/tex/context/base/math-ini.mkii
+++ b/tex/context/base/mkii/math-ini.mkii
diff --git a/tex/context/base/math-lbr.mkii b/tex/context/base/mkii/math-lbr.mkii
index 0aa1df665..0aa1df665 100644
--- a/tex/context/base/math-lbr.mkii
+++ b/tex/context/base/mkii/math-lbr.mkii
diff --git a/tex/context/base/math-pln.mkii b/tex/context/base/mkii/math-pln.mkii
index 975869c70..975869c70 100644
--- a/tex/context/base/math-pln.mkii
+++ b/tex/context/base/mkii/math-pln.mkii
diff --git a/tex/context/base/math-run.mkii b/tex/context/base/mkii/math-run.mkii
index 79d08fbed..79d08fbed 100644
--- a/tex/context/base/math-run.mkii
+++ b/tex/context/base/mkii/math-run.mkii
diff --git a/tex/context/base/math-tex.mkii b/tex/context/base/mkii/math-tex.mkii
index e3dd634e6..e3dd634e6 100644
--- a/tex/context/base/math-tex.mkii
+++ b/tex/context/base/mkii/math-tex.mkii
diff --git a/tex/context/base/math-tim.mkii b/tex/context/base/mkii/math-tim.mkii
index da7d17e7b..da7d17e7b 100644
--- a/tex/context/base/math-tim.mkii
+++ b/tex/context/base/mkii/math-tim.mkii
diff --git a/tex/context/base/math-uni.mkii b/tex/context/base/mkii/math-uni.mkii
index 5c75a9fb4..5c75a9fb4 100644
--- a/tex/context/base/math-uni.mkii
+++ b/tex/context/base/mkii/math-uni.mkii
diff --git a/tex/context/base/meta-clp.mkii b/tex/context/base/mkii/meta-clp.mkii
index 5c9206dee..5c9206dee 100644
--- a/tex/context/base/meta-clp.mkii
+++ b/tex/context/base/mkii/meta-clp.mkii
diff --git a/tex/context/base/meta-dum.mkii b/tex/context/base/mkii/meta-dum.mkii
index dae30ed69..dae30ed69 100644
--- a/tex/context/base/meta-dum.mkii
+++ b/tex/context/base/mkii/meta-dum.mkii
diff --git a/tex/context/base/meta-fig.mkii b/tex/context/base/mkii/meta-fig.mkii
index 31fe5fc0c..31fe5fc0c 100644
--- a/tex/context/base/meta-fig.mkii
+++ b/tex/context/base/mkii/meta-fig.mkii
diff --git a/tex/context/base/meta-ini.mkii b/tex/context/base/mkii/meta-ini.mkii
index 9780fecfa..9780fecfa 100644
--- a/tex/context/base/meta-ini.mkii
+++ b/tex/context/base/mkii/meta-ini.mkii
diff --git a/tex/context/base/meta-mis.mkii b/tex/context/base/mkii/meta-mis.mkii
index e8282c381..e8282c381 100644
--- a/tex/context/base/meta-mis.mkii
+++ b/tex/context/base/mkii/meta-mis.mkii
diff --git a/tex/context/base/meta-nav.mkii b/tex/context/base/mkii/meta-nav.mkii
index 45a31ba5e..45a31ba5e 100644
--- a/tex/context/base/meta-nav.mkii
+++ b/tex/context/base/mkii/meta-nav.mkii
diff --git a/tex/context/base/meta-pag.mkii b/tex/context/base/mkii/meta-pag.mkii
index 82a525a08..82a525a08 100644
--- a/tex/context/base/meta-pag.mkii
+++ b/tex/context/base/mkii/meta-pag.mkii
diff --git a/tex/context/base/meta-pdf.mkii b/tex/context/base/mkii/meta-pdf.mkii
index e13113398..e13113398 100644
--- a/tex/context/base/meta-pdf.mkii
+++ b/tex/context/base/mkii/meta-pdf.mkii
diff --git a/tex/context/base/meta-pre.mkii b/tex/context/base/mkii/meta-pre.mkii
index 098be030b..098be030b 100644
--- a/tex/context/base/meta-pre.mkii
+++ b/tex/context/base/mkii/meta-pre.mkii
diff --git a/tex/context/base/meta-tex.mkii b/tex/context/base/mkii/meta-tex.mkii
index ab0f24457..ab0f24457 100644
--- a/tex/context/base/meta-tex.mkii
+++ b/tex/context/base/mkii/meta-tex.mkii
diff --git a/tex/context/base/meta-txt.mkii b/tex/context/base/mkii/meta-txt.mkii
index dc8bb7ca8..dc8bb7ca8 100644
--- a/tex/context/base/meta-txt.mkii
+++ b/tex/context/base/mkii/meta-txt.mkii
diff --git a/tex/context/base/meta-xml.mkii b/tex/context/base/mkii/meta-xml.mkii
index 71708a0f9..71708a0f9 100644
--- a/tex/context/base/meta-xml.mkii
+++ b/tex/context/base/mkii/meta-xml.mkii
diff --git a/tex/context/base/mult-aux.mkii b/tex/context/base/mkii/mult-aux.mkii
index 3869a95db..3869a95db 100644
--- a/tex/context/base/mult-aux.mkii
+++ b/tex/context/base/mkii/mult-aux.mkii
diff --git a/tex/context/base/mult-chk.mkii b/tex/context/base/mkii/mult-chk.mkii
index cde00fd44..cde00fd44 100644
--- a/tex/context/base/mult-chk.mkii
+++ b/tex/context/base/mkii/mult-chk.mkii
diff --git a/tex/context/base/mult-com.mkii b/tex/context/base/mkii/mult-com.mkii
index 600819b7e..600819b7e 100644
--- a/tex/context/base/mult-com.mkii
+++ b/tex/context/base/mkii/mult-com.mkii
diff --git a/tex/context/base/mult-con.mkii b/tex/context/base/mkii/mult-con.mkii
index 7d0a47bd0..7d0a47bd0 100644
--- a/tex/context/base/mult-con.mkii
+++ b/tex/context/base/mkii/mult-con.mkii
diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 07408b328..07408b328 100644
--- a/tex/context/base/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
diff --git a/tex/context/base/mult-def.mkii b/tex/context/base/mkii/mult-def.mkii
index a75ef993f..a75ef993f 100644
--- a/tex/context/base/mult-def.mkii
+++ b/tex/context/base/mkii/mult-def.mkii
diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index 79b086342..79b086342 100644
--- a/tex/context/base/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index f4763a12d..f4763a12d 100644
--- a/tex/context/base/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
diff --git a/tex/context/base/mult-fst.mkii b/tex/context/base/mkii/mult-fst.mkii
index 36c3f181f..36c3f181f 100644
--- a/tex/context/base/mult-fst.mkii
+++ b/tex/context/base/mkii/mult-fst.mkii
diff --git a/tex/context/base/mult-ini.mkii b/tex/context/base/mkii/mult-ini.mkii
index 76f6d69f2..76f6d69f2 100644
--- a/tex/context/base/mult-ini.mkii
+++ b/tex/context/base/mkii/mult-ini.mkii
diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii
index e456eaf78..e456eaf78 100644
--- a/tex/context/base/mult-it.mkii
+++ b/tex/context/base/mkii/mult-it.mkii
diff --git a/tex/context/base/mult-mcs.mkii b/tex/context/base/mkii/mult-mcs.mkii
index c733798e6..c733798e6 100644
--- a/tex/context/base/mult-mcs.mkii
+++ b/tex/context/base/mkii/mult-mcs.mkii
diff --git a/tex/context/base/mult-mde.mkii b/tex/context/base/mkii/mult-mde.mkii
index 4d7f009e4..4d7f009e4 100644
--- a/tex/context/base/mult-mde.mkii
+++ b/tex/context/base/mkii/mult-mde.mkii
diff --git a/tex/context/base/mult-men.mkii b/tex/context/base/mkii/mult-men.mkii
index a8d429356..a8d429356 100644
--- a/tex/context/base/mult-men.mkii
+++ b/tex/context/base/mkii/mult-men.mkii
diff --git a/tex/context/base/mult-mfr.mkii b/tex/context/base/mkii/mult-mfr.mkii
index 7fee954c0..7fee954c0 100644
--- a/tex/context/base/mult-mfr.mkii
+++ b/tex/context/base/mkii/mult-mfr.mkii
diff --git a/tex/context/base/mult-mit.mkii b/tex/context/base/mkii/mult-mit.mkii
index 9d09e2676..9d09e2676 100644
--- a/tex/context/base/mult-mit.mkii
+++ b/tex/context/base/mkii/mult-mit.mkii
diff --git a/tex/context/base/mult-mnl.mkii b/tex/context/base/mkii/mult-mnl.mkii
index fb527d4ad..fb527d4ad 100644
--- a/tex/context/base/mult-mnl.mkii
+++ b/tex/context/base/mkii/mult-mnl.mkii
diff --git a/tex/context/base/mult-mno.mkii b/tex/context/base/mkii/mult-mno.mkii
index bbbc3a658..bbbc3a658 100644
--- a/tex/context/base/mult-mno.mkii
+++ b/tex/context/base/mkii/mult-mno.mkii
diff --git a/tex/context/base/mult-mpe.mkii b/tex/context/base/mkii/mult-mpe.mkii
index a8d429356..a8d429356 100644
--- a/tex/context/base/mult-mpe.mkii
+++ b/tex/context/base/mkii/mult-mpe.mkii
diff --git a/tex/context/base/mult-mro.mkii b/tex/context/base/mkii/mult-mro.mkii
index 70673c317..70673c317 100644
--- a/tex/context/base/mult-mro.mkii
+++ b/tex/context/base/mkii/mult-mro.mkii
diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index 432d453ed..432d453ed 100644
--- a/tex/context/base/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index c6f7e5b3c..c6f7e5b3c 100644
--- a/tex/context/base/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 668a9c8e4..668a9c8e4 100644
--- a/tex/context/base/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
diff --git a/tex/context/base/mult-sys.mkii b/tex/context/base/mkii/mult-sys.mkii
index 1961fdf11..1961fdf11 100644
--- a/tex/context/base/mult-sys.mkii
+++ b/tex/context/base/mkii/mult-sys.mkii
diff --git a/tex/context/base/norm-alo.mkii b/tex/context/base/mkii/norm-alo.mkii
index d359cf7e8..d359cf7e8 100644
--- a/tex/context/base/norm-alo.mkii
+++ b/tex/context/base/mkii/norm-alo.mkii
diff --git a/tex/context/base/norm-ctx.mkii b/tex/context/base/mkii/norm-ctx.mkii
index b1a4c7d35..b1a4c7d35 100644
--- a/tex/context/base/norm-ctx.mkii
+++ b/tex/context/base/mkii/norm-ctx.mkii
diff --git a/tex/context/base/norm-etx.mkii b/tex/context/base/mkii/norm-etx.mkii
index bd244e4d1..bd244e4d1 100644
--- a/tex/context/base/norm-etx.mkii
+++ b/tex/context/base/mkii/norm-etx.mkii
diff --git a/tex/context/base/norm-ltx.mkii b/tex/context/base/mkii/norm-ltx.mkii
index 9a8f7ba57..9a8f7ba57 100644
--- a/tex/context/base/norm-ltx.mkii
+++ b/tex/context/base/mkii/norm-ltx.mkii
diff --git a/tex/context/base/norm-ptx.mkii b/tex/context/base/mkii/norm-ptx.mkii
index 14a57aeec..14a57aeec 100644
--- a/tex/context/base/norm-ptx.mkii
+++ b/tex/context/base/mkii/norm-ptx.mkii
diff --git a/tex/context/base/norm-tex.mkii b/tex/context/base/mkii/norm-tex.mkii
index 0bd54f71a..0bd54f71a 100644
--- a/tex/context/base/norm-tex.mkii
+++ b/tex/context/base/mkii/norm-tex.mkii
diff --git a/tex/context/base/norm-xtx.mkii b/tex/context/base/mkii/norm-xtx.mkii
index 851b90b31..851b90b31 100644
--- a/tex/context/base/norm-xtx.mkii
+++ b/tex/context/base/mkii/norm-xtx.mkii
diff --git a/tex/context/base/pack-box.mkii b/tex/context/base/mkii/pack-box.mkii
index 1752e2b91..1752e2b91 100644
--- a/tex/context/base/pack-box.mkii
+++ b/tex/context/base/mkii/pack-box.mkii
diff --git a/tex/context/base/pack-lyr.mkii b/tex/context/base/mkii/pack-lyr.mkii
index 1b0c0fd63..1b0c0fd63 100644
--- a/tex/context/base/pack-lyr.mkii
+++ b/tex/context/base/mkii/pack-lyr.mkii
diff --git a/tex/context/base/pack-obj.mkii b/tex/context/base/mkii/pack-obj.mkii
index 81523d525..81523d525 100644
--- a/tex/context/base/pack-obj.mkii
+++ b/tex/context/base/mkii/pack-obj.mkii
diff --git a/tex/context/base/pack-rul.mkii b/tex/context/base/mkii/pack-rul.mkii
index 7399cacd8..7399cacd8 100644
--- a/tex/context/base/pack-rul.mkii
+++ b/tex/context/base/mkii/pack-rul.mkii
diff --git a/tex/context/base/page-app.mkii b/tex/context/base/mkii/page-app.mkii
index 75e0cf874..75e0cf874 100644
--- a/tex/context/base/page-app.mkii
+++ b/tex/context/base/mkii/page-app.mkii
diff --git a/tex/context/base/page-bck.mkii b/tex/context/base/mkii/page-bck.mkii
index 4c636d29e..4c636d29e 100644
--- a/tex/context/base/page-bck.mkii
+++ b/tex/context/base/mkii/page-bck.mkii
diff --git a/tex/context/base/page-flw.mkii b/tex/context/base/mkii/page-flw.mkii
index ba8fd3eab..ba8fd3eab 100644
--- a/tex/context/base/page-flw.mkii
+++ b/tex/context/base/mkii/page-flw.mkii
diff --git a/tex/context/base/page-imp.mkii b/tex/context/base/mkii/page-imp.mkii
index bf10504b4..bf10504b4 100644
--- a/tex/context/base/page-imp.mkii
+++ b/tex/context/base/mkii/page-imp.mkii
diff --git a/tex/context/base/page-ini.mkii b/tex/context/base/mkii/page-ini.mkii
index bc4aab60f..bc4aab60f 100644
--- a/tex/context/base/page-ini.mkii
+++ b/tex/context/base/mkii/page-ini.mkii
diff --git a/tex/context/base/page-ins.mkii b/tex/context/base/mkii/page-ins.mkii
index ce0f51d72..ce0f51d72 100644
--- a/tex/context/base/page-ins.mkii
+++ b/tex/context/base/mkii/page-ins.mkii
diff --git a/tex/context/base/page-lay.mkii b/tex/context/base/mkii/page-lay.mkii
index 61ff8764f..61ff8764f 100644
--- a/tex/context/base/page-lay.mkii
+++ b/tex/context/base/mkii/page-lay.mkii
diff --git a/tex/context/base/page-lin.mkii b/tex/context/base/mkii/page-lin.mkii
index c6b352ae7..c6b352ae7 100644
--- a/tex/context/base/page-lin.mkii
+++ b/tex/context/base/mkii/page-lin.mkii
diff --git a/tex/context/base/page-log.mkii b/tex/context/base/mkii/page-log.mkii
index c64c27bce..c64c27bce 100644
--- a/tex/context/base/page-log.mkii
+++ b/tex/context/base/mkii/page-log.mkii
diff --git a/tex/context/base/page-mak.mkii b/tex/context/base/mkii/page-mak.mkii
index 3a513137f..3a513137f 100644
--- a/tex/context/base/page-mak.mkii
+++ b/tex/context/base/mkii/page-mak.mkii
diff --git a/tex/context/base/page-mar.mkii b/tex/context/base/mkii/page-mar.mkii
index d386d8ab9..d386d8ab9 100644
--- a/tex/context/base/page-mar.mkii
+++ b/tex/context/base/mkii/page-mar.mkii
diff --git a/tex/context/base/page-mis.mkii b/tex/context/base/mkii/page-mis.mkii
index a61b2435b..a61b2435b 100644
--- a/tex/context/base/page-mis.mkii
+++ b/tex/context/base/mkii/page-mis.mkii
diff --git a/tex/context/base/page-mul.mkii b/tex/context/base/mkii/page-mul.mkii
index decf784f0..decf784f0 100644
--- a/tex/context/base/page-mul.mkii
+++ b/tex/context/base/mkii/page-mul.mkii
diff --git a/tex/context/base/page-not.mkii b/tex/context/base/mkii/page-not.mkii
index 7bb982430..7bb982430 100644
--- a/tex/context/base/page-not.mkii
+++ b/tex/context/base/mkii/page-not.mkii
diff --git a/tex/context/base/page-one.mkii b/tex/context/base/mkii/page-one.mkii
index fe4b285cb..fe4b285cb 100644
--- a/tex/context/base/page-one.mkii
+++ b/tex/context/base/mkii/page-one.mkii
diff --git a/tex/context/base/page-par.mkii b/tex/context/base/mkii/page-par.mkii
index 9b5e0b6eb..9b5e0b6eb 100644
--- a/tex/context/base/page-par.mkii
+++ b/tex/context/base/mkii/page-par.mkii
diff --git a/tex/context/base/page-plg.mkii b/tex/context/base/mkii/page-plg.mkii
index 3c3255f4c..3c3255f4c 100644
--- a/tex/context/base/page-plg.mkii
+++ b/tex/context/base/mkii/page-plg.mkii
diff --git a/tex/context/base/page-run.mkii b/tex/context/base/mkii/page-run.mkii
index b128c192d..b128c192d 100644
--- a/tex/context/base/page-run.mkii
+++ b/tex/context/base/mkii/page-run.mkii
diff --git a/tex/context/base/page-set.mkii b/tex/context/base/mkii/page-set.mkii
index 3c8c87e5c..3c8c87e5c 100644
--- a/tex/context/base/page-set.mkii
+++ b/tex/context/base/mkii/page-set.mkii
diff --git a/tex/context/base/page-sid.mkii b/tex/context/base/mkii/page-sid.mkii
index 6c3447e1c..6c3447e1c 100644
--- a/tex/context/base/page-sid.mkii
+++ b/tex/context/base/mkii/page-sid.mkii
diff --git a/tex/context/base/page-spr.mkii b/tex/context/base/mkii/page-spr.mkii
index 65e435d7c..65e435d7c 100644
--- a/tex/context/base/page-spr.mkii
+++ b/tex/context/base/mkii/page-spr.mkii
diff --git a/tex/context/base/page-str.mkii b/tex/context/base/mkii/page-str.mkii
index df0cc5aa2..df0cc5aa2 100644
--- a/tex/context/base/page-str.mkii
+++ b/tex/context/base/mkii/page-str.mkii
diff --git a/tex/context/base/page-txt.mkii b/tex/context/base/mkii/page-txt.mkii
index dd643b1b4..dd643b1b4 100644
--- a/tex/context/base/page-txt.mkii
+++ b/tex/context/base/mkii/page-txt.mkii
diff --git a/tex/context/base/pdfr-def.mkii b/tex/context/base/mkii/pdfr-def.mkii
index b3f67b93f..b3f67b93f 100644
--- a/tex/context/base/pdfr-def.mkii
+++ b/tex/context/base/mkii/pdfr-def.mkii
diff --git a/tex/context/base/pdfr-ec.mkii b/tex/context/base/mkii/pdfr-ec.mkii
index e2208aa36..e2208aa36 100644
--- a/tex/context/base/pdfr-ec.mkii
+++ b/tex/context/base/mkii/pdfr-ec.mkii
diff --git a/tex/context/base/pdfr-il2.mkii b/tex/context/base/mkii/pdfr-il2.mkii
index 81f9c42ac..81f9c42ac 100644
--- a/tex/context/base/pdfr-il2.mkii
+++ b/tex/context/base/mkii/pdfr-il2.mkii
diff --git a/tex/context/base/prop-ini.mkii b/tex/context/base/mkii/prop-ini.mkii
index 11efd0362..11efd0362 100644
--- a/tex/context/base/prop-ini.mkii
+++ b/tex/context/base/mkii/prop-ini.mkii
diff --git a/tex/context/base/prop-lay.mkii b/tex/context/base/mkii/prop-lay.mkii
index 77c48ca6e..77c48ca6e 100644
--- a/tex/context/base/prop-lay.mkii
+++ b/tex/context/base/mkii/prop-lay.mkii
diff --git a/tex/context/base/prop-mis.mkii b/tex/context/base/mkii/prop-mis.mkii
index 47fb9ea06..47fb9ea06 100644
--- a/tex/context/base/prop-mis.mkii
+++ b/tex/context/base/mkii/prop-mis.mkii
diff --git a/tex/context/base/regi-8859-1.mkii b/tex/context/base/mkii/regi-8859-1.mkii
index 00439ae9e..00439ae9e 100644
--- a/tex/context/base/regi-8859-1.mkii
+++ b/tex/context/base/mkii/regi-8859-1.mkii
diff --git a/tex/context/base/regi-8859-10.mkii b/tex/context/base/mkii/regi-8859-10.mkii
index 664686034..664686034 100644
--- a/tex/context/base/regi-8859-10.mkii
+++ b/tex/context/base/mkii/regi-8859-10.mkii
diff --git a/tex/context/base/regi-8859-13.mkii b/tex/context/base/mkii/regi-8859-13.mkii
index f1b1dbe78..f1b1dbe78 100644
--- a/tex/context/base/regi-8859-13.mkii
+++ b/tex/context/base/mkii/regi-8859-13.mkii
diff --git a/tex/context/base/regi-8859-15.mkii b/tex/context/base/mkii/regi-8859-15.mkii
index 1455161c3..1455161c3 100644
--- a/tex/context/base/regi-8859-15.mkii
+++ b/tex/context/base/mkii/regi-8859-15.mkii
diff --git a/tex/context/base/regi-8859-16.mkii b/tex/context/base/mkii/regi-8859-16.mkii
index f284c4116..f284c4116 100644
--- a/tex/context/base/regi-8859-16.mkii
+++ b/tex/context/base/mkii/regi-8859-16.mkii
diff --git a/tex/context/base/regi-8859-2.mkii b/tex/context/base/mkii/regi-8859-2.mkii
index 9efc27a79..9efc27a79 100644
--- a/tex/context/base/regi-8859-2.mkii
+++ b/tex/context/base/mkii/regi-8859-2.mkii
diff --git a/tex/context/base/regi-8859-3.mkii b/tex/context/base/mkii/regi-8859-3.mkii
index 99fa66ac3..99fa66ac3 100644
--- a/tex/context/base/regi-8859-3.mkii
+++ b/tex/context/base/mkii/regi-8859-3.mkii
diff --git a/tex/context/base/regi-8859-4.mkii b/tex/context/base/mkii/regi-8859-4.mkii
index c7adf3471..c7adf3471 100644
--- a/tex/context/base/regi-8859-4.mkii
+++ b/tex/context/base/mkii/regi-8859-4.mkii
diff --git a/tex/context/base/regi-8859-5.mkii b/tex/context/base/mkii/regi-8859-5.mkii
index 807d74640..807d74640 100644
--- a/tex/context/base/regi-8859-5.mkii
+++ b/tex/context/base/mkii/regi-8859-5.mkii
diff --git a/tex/context/base/regi-8859-7.mkii b/tex/context/base/mkii/regi-8859-7.mkii
index 1c8197a42..1c8197a42 100644
--- a/tex/context/base/regi-8859-7.mkii
+++ b/tex/context/base/mkii/regi-8859-7.mkii
diff --git a/tex/context/base/regi-8859-9.mkii b/tex/context/base/mkii/regi-8859-9.mkii
index 60757b2e6..60757b2e6 100644
--- a/tex/context/base/regi-8859-9.mkii
+++ b/tex/context/base/mkii/regi-8859-9.mkii
diff --git a/tex/context/base/regi-cp1250.mkii b/tex/context/base/mkii/regi-cp1250.mkii
index c13ee53e2..c13ee53e2 100644
--- a/tex/context/base/regi-cp1250.mkii
+++ b/tex/context/base/mkii/regi-cp1250.mkii
diff --git a/tex/context/base/regi-cp1251.mkii b/tex/context/base/mkii/regi-cp1251.mkii
index 66576bd16..66576bd16 100644
--- a/tex/context/base/regi-cp1251.mkii
+++ b/tex/context/base/mkii/regi-cp1251.mkii
diff --git a/tex/context/base/regi-cp1252.mkii b/tex/context/base/mkii/regi-cp1252.mkii
index 316d694a6..316d694a6 100644
--- a/tex/context/base/regi-cp1252.mkii
+++ b/tex/context/base/mkii/regi-cp1252.mkii
diff --git a/tex/context/base/regi-cp1253.mkii b/tex/context/base/mkii/regi-cp1253.mkii
index 05d53c129..05d53c129 100644
--- a/tex/context/base/regi-cp1253.mkii
+++ b/tex/context/base/mkii/regi-cp1253.mkii
diff --git a/tex/context/base/regi-cp1254.mkii b/tex/context/base/mkii/regi-cp1254.mkii
index 73f8f2708..73f8f2708 100644
--- a/tex/context/base/regi-cp1254.mkii
+++ b/tex/context/base/mkii/regi-cp1254.mkii
diff --git a/tex/context/base/regi-cp1257.mkii b/tex/context/base/mkii/regi-cp1257.mkii
index 4c9cb56f0..4c9cb56f0 100644
--- a/tex/context/base/regi-cp1257.mkii
+++ b/tex/context/base/mkii/regi-cp1257.mkii
diff --git a/tex/context/base/regi-cyp.mkii b/tex/context/base/mkii/regi-cyp.mkii
index 3f45ace23..3f45ace23 100644
--- a/tex/context/base/regi-cyp.mkii
+++ b/tex/context/base/mkii/regi-cyp.mkii
diff --git a/tex/context/base/regi-cyr.mkii b/tex/context/base/mkii/regi-cyr.mkii
index 1910c0e7c..1910c0e7c 100644
--- a/tex/context/base/regi-cyr.mkii
+++ b/tex/context/base/mkii/regi-cyr.mkii
diff --git a/tex/context/base/regi-def.mkii b/tex/context/base/mkii/regi-def.mkii
index 3af0c9d3c..3af0c9d3c 100644
--- a/tex/context/base/regi-def.mkii
+++ b/tex/context/base/mkii/regi-def.mkii
diff --git a/tex/context/base/regi-ibm.mkii b/tex/context/base/mkii/regi-ibm.mkii
index 5756e7705..5756e7705 100644
--- a/tex/context/base/regi-ibm.mkii
+++ b/tex/context/base/mkii/regi-ibm.mkii
diff --git a/tex/context/base/regi-ini.mkii b/tex/context/base/mkii/regi-ini.mkii
index 1122ce18a..1122ce18a 100644
--- a/tex/context/base/regi-ini.mkii
+++ b/tex/context/base/mkii/regi-ini.mkii
diff --git a/tex/context/base/regi-mac.mkii b/tex/context/base/mkii/regi-mac.mkii
index 30f57ab18..30f57ab18 100644
--- a/tex/context/base/regi-mac.mkii
+++ b/tex/context/base/mkii/regi-mac.mkii
diff --git a/tex/context/base/regi-syn.mkii b/tex/context/base/mkii/regi-syn.mkii
index 09fd59dee..09fd59dee 100644
--- a/tex/context/base/regi-syn.mkii
+++ b/tex/context/base/mkii/regi-syn.mkii
diff --git a/tex/context/base/regi-uni.mkii b/tex/context/base/mkii/regi-uni.mkii
index fe2f99a4f..fe2f99a4f 100644
--- a/tex/context/base/regi-uni.mkii
+++ b/tex/context/base/mkii/regi-uni.mkii
diff --git a/tex/context/base/regi-utf.mkii b/tex/context/base/mkii/regi-utf.mkii
index 09926a172..09926a172 100644
--- a/tex/context/base/regi-utf.mkii
+++ b/tex/context/base/mkii/regi-utf.mkii
diff --git a/tex/context/base/regi-vis.mkii b/tex/context/base/mkii/regi-vis.mkii
index 1807bdc93..1807bdc93 100644
--- a/tex/context/base/regi-vis.mkii
+++ b/tex/context/base/mkii/regi-vis.mkii
diff --git a/tex/context/base/scrn-fld.mkii b/tex/context/base/mkii/scrn-fld.mkii
index 993b510ea..993b510ea 100644
--- a/tex/context/base/scrn-fld.mkii
+++ b/tex/context/base/mkii/scrn-fld.mkii
diff --git a/tex/context/base/scrn-hlp.mkii b/tex/context/base/mkii/scrn-hlp.mkii
index c526f51eb..c526f51eb 100644
--- a/tex/context/base/scrn-hlp.mkii
+++ b/tex/context/base/mkii/scrn-hlp.mkii
diff --git a/tex/context/base/scrn-int.mkii b/tex/context/base/mkii/scrn-int.mkii
index 01d8501e2..01d8501e2 100644
--- a/tex/context/base/scrn-int.mkii
+++ b/tex/context/base/mkii/scrn-int.mkii
diff --git a/tex/context/base/scrn-nav.mkii b/tex/context/base/mkii/scrn-nav.mkii
index 3bb56bace..3bb56bace 100644
--- a/tex/context/base/scrn-nav.mkii
+++ b/tex/context/base/mkii/scrn-nav.mkii
diff --git a/tex/context/base/sort-def.mkii b/tex/context/base/mkii/sort-def.mkii
index 168f94e9e..168f94e9e 100644
--- a/tex/context/base/sort-def.mkii
+++ b/tex/context/base/mkii/sort-def.mkii
diff --git a/tex/context/base/sort-ini.mkii b/tex/context/base/mkii/sort-ini.mkii
index 8114f82c8..8114f82c8 100644
--- a/tex/context/base/sort-ini.mkii
+++ b/tex/context/base/mkii/sort-ini.mkii
diff --git a/tex/context/base/sort-lan.mkii b/tex/context/base/mkii/sort-lan.mkii
index c23962371..c23962371 100644
--- a/tex/context/base/sort-lan.mkii
+++ b/tex/context/base/mkii/sort-lan.mkii
diff --git a/tex/context/base/spac-gen.mkii b/tex/context/base/mkii/spac-gen.mkii
index 91e379250..91e379250 100644
--- a/tex/context/base/spac-gen.mkii
+++ b/tex/context/base/mkii/spac-gen.mkii
diff --git a/tex/context/base/spac-grd.mkii b/tex/context/base/mkii/spac-grd.mkii
index 97699de51..97699de51 100644
--- a/tex/context/base/spac-grd.mkii
+++ b/tex/context/base/mkii/spac-grd.mkii
diff --git a/tex/context/base/spec-def.mkii b/tex/context/base/mkii/spec-def.mkii
index 60051579d..60051579d 100644
--- a/tex/context/base/spec-def.mkii
+++ b/tex/context/base/mkii/spec-def.mkii
diff --git a/tex/context/base/spec-dpm.mkii b/tex/context/base/mkii/spec-dpm.mkii
index fe721405a..fe721405a 100644
--- a/tex/context/base/spec-dpm.mkii
+++ b/tex/context/base/mkii/spec-dpm.mkii
diff --git a/tex/context/base/spec-dpx.mkii b/tex/context/base/mkii/spec-dpx.mkii
index 323152e0b..323152e0b 100644
--- a/tex/context/base/spec-dpx.mkii
+++ b/tex/context/base/mkii/spec-dpx.mkii
diff --git a/tex/context/base/spec-dvi.mkii b/tex/context/base/mkii/spec-dvi.mkii
index 89a1330a2..89a1330a2 100644
--- a/tex/context/base/spec-dvi.mkii
+++ b/tex/context/base/mkii/spec-dvi.mkii
diff --git a/tex/context/base/spec-fdf.mkii b/tex/context/base/mkii/spec-fdf.mkii
index 0713fa80c..0713fa80c 100644
--- a/tex/context/base/spec-fdf.mkii
+++ b/tex/context/base/mkii/spec-fdf.mkii
diff --git a/tex/context/base/spec-ini.mkii b/tex/context/base/mkii/spec-ini.mkii
index 9361ed222..9361ed222 100644
--- a/tex/context/base/spec-ini.mkii
+++ b/tex/context/base/mkii/spec-ini.mkii
diff --git a/tex/context/base/spec-mis.mkii b/tex/context/base/mkii/spec-mis.mkii
index de0debd3c..de0debd3c 100644
--- a/tex/context/base/spec-mis.mkii
+++ b/tex/context/base/mkii/spec-mis.mkii
diff --git a/tex/context/base/spec-pdf.mkii b/tex/context/base/mkii/spec-pdf.mkii
index 33722f603..33722f603 100644
--- a/tex/context/base/spec-pdf.mkii
+++ b/tex/context/base/mkii/spec-pdf.mkii
diff --git a/tex/context/base/spec-ps.mkii b/tex/context/base/mkii/spec-ps.mkii
index 02ec16453..02ec16453 100644
--- a/tex/context/base/spec-ps.mkii
+++ b/tex/context/base/mkii/spec-ps.mkii
diff --git a/tex/context/base/spec-tpd.mkii b/tex/context/base/mkii/spec-tpd.mkii
index 042d5cdfe..042d5cdfe 100644
--- a/tex/context/base/spec-tpd.mkii
+++ b/tex/context/base/mkii/spec-tpd.mkii
diff --git a/tex/context/base/spec-tr.mkii b/tex/context/base/mkii/spec-tr.mkii
index 19ddb7495..19ddb7495 100644
--- a/tex/context/base/spec-tr.mkii
+++ b/tex/context/base/mkii/spec-tr.mkii
diff --git a/tex/context/base/spec-tst.mkii b/tex/context/base/mkii/spec-tst.mkii
index 4f580e7b4..4f580e7b4 100644
--- a/tex/context/base/spec-tst.mkii
+++ b/tex/context/base/mkii/spec-tst.mkii
diff --git a/tex/context/base/spec-var.mkii b/tex/context/base/mkii/spec-var.mkii
index 3641ba959..3641ba959 100644
--- a/tex/context/base/spec-var.mkii
+++ b/tex/context/base/mkii/spec-var.mkii
diff --git a/tex/context/base/spec-win.mkii b/tex/context/base/mkii/spec-win.mkii
index e16984a56..e16984a56 100644
--- a/tex/context/base/spec-win.mkii
+++ b/tex/context/base/mkii/spec-win.mkii
diff --git a/tex/context/base/spec-xet.mkii b/tex/context/base/mkii/spec-xet.mkii
index 0cbd55ba7..0cbd55ba7 100644
--- a/tex/context/base/spec-xet.mkii
+++ b/tex/context/base/mkii/spec-xet.mkii
diff --git a/tex/context/base/spec-xtx.mkii b/tex/context/base/mkii/spec-xtx.mkii
index 81b83e663..81b83e663 100644
--- a/tex/context/base/spec-xtx.mkii
+++ b/tex/context/base/mkii/spec-xtx.mkii
diff --git a/tex/context/base/spec-yy.mkii b/tex/context/base/mkii/spec-yy.mkii
index b5a1d590b..b5a1d590b 100644
--- a/tex/context/base/spec-yy.mkii
+++ b/tex/context/base/mkii/spec-yy.mkii
diff --git a/tex/context/base/strc-blk.mkii b/tex/context/base/mkii/strc-blk.mkii
index b6056769c..b6056769c 100644
--- a/tex/context/base/strc-blk.mkii
+++ b/tex/context/base/mkii/strc-blk.mkii
diff --git a/tex/context/base/strc-des.mkii b/tex/context/base/mkii/strc-des.mkii
index e699df9ea..e699df9ea 100644
--- a/tex/context/base/strc-des.mkii
+++ b/tex/context/base/mkii/strc-des.mkii
diff --git a/tex/context/base/strc-flt.mkii b/tex/context/base/mkii/strc-flt.mkii
index 26125c65f..26125c65f 100644
--- a/tex/context/base/strc-flt.mkii
+++ b/tex/context/base/mkii/strc-flt.mkii
diff --git a/tex/context/base/strc-itm.mkii b/tex/context/base/mkii/strc-itm.mkii
index 697618323..697618323 100644
--- a/tex/context/base/strc-itm.mkii
+++ b/tex/context/base/mkii/strc-itm.mkii
diff --git a/tex/context/base/strc-lnt.mkii b/tex/context/base/mkii/strc-lnt.mkii
index 3c878a8d2..3c878a8d2 100644
--- a/tex/context/base/strc-lnt.mkii
+++ b/tex/context/base/mkii/strc-lnt.mkii
diff --git a/tex/context/base/strc-lst.mkii b/tex/context/base/mkii/strc-lst.mkii
index ffb1a4dbd..ffb1a4dbd 100644
--- a/tex/context/base/strc-lst.mkii
+++ b/tex/context/base/mkii/strc-lst.mkii
diff --git a/tex/context/base/strc-mar.mkii b/tex/context/base/mkii/strc-mar.mkii
index 2ae81e47b..2ae81e47b 100644
--- a/tex/context/base/strc-mar.mkii
+++ b/tex/context/base/mkii/strc-mar.mkii
diff --git a/tex/context/base/strc-mat.mkii b/tex/context/base/mkii/strc-mat.mkii
index 34f716f3b..34f716f3b 100644
--- a/tex/context/base/strc-mat.mkii
+++ b/tex/context/base/mkii/strc-mat.mkii
diff --git a/tex/context/base/strc-not.mkii b/tex/context/base/mkii/strc-not.mkii
index bee21342e..bee21342e 100644
--- a/tex/context/base/strc-not.mkii
+++ b/tex/context/base/mkii/strc-not.mkii
diff --git a/tex/context/base/strc-num.mkii b/tex/context/base/mkii/strc-num.mkii
index 99fb687c8..99fb687c8 100644
--- a/tex/context/base/strc-num.mkii
+++ b/tex/context/base/mkii/strc-num.mkii
diff --git a/tex/context/base/strc-pag.mkii b/tex/context/base/mkii/strc-pag.mkii
index 40e69b849..40e69b849 100644
--- a/tex/context/base/strc-pag.mkii
+++ b/tex/context/base/mkii/strc-pag.mkii
diff --git a/tex/context/base/strc-ref.mkii b/tex/context/base/mkii/strc-ref.mkii
index 8a135eb04..8a135eb04 100644
--- a/tex/context/base/strc-ref.mkii
+++ b/tex/context/base/mkii/strc-ref.mkii
diff --git a/tex/context/base/strc-reg.mkii b/tex/context/base/mkii/strc-reg.mkii
index 45be82525..45be82525 100644
--- a/tex/context/base/strc-reg.mkii
+++ b/tex/context/base/mkii/strc-reg.mkii
diff --git a/tex/context/base/strc-sec.mkii b/tex/context/base/mkii/strc-sec.mkii
index 01ca71ead..01ca71ead 100644
--- a/tex/context/base/strc-sec.mkii
+++ b/tex/context/base/mkii/strc-sec.mkii
diff --git a/tex/context/base/strc-swd.mkii b/tex/context/base/mkii/strc-swd.mkii
index 1525ab597..1525ab597 100644
--- a/tex/context/base/strc-swd.mkii
+++ b/tex/context/base/mkii/strc-swd.mkii
diff --git a/tex/context/base/strc-syn.mkii b/tex/context/base/mkii/strc-syn.mkii
index 2ba5c9467..2ba5c9467 100644
--- a/tex/context/base/strc-syn.mkii
+++ b/tex/context/base/mkii/strc-syn.mkii
diff --git a/tex/context/base/supp-ali.mkii b/tex/context/base/mkii/supp-ali.mkii
index c4a1aadc5..c4a1aadc5 100644
--- a/tex/context/base/supp-ali.mkii
+++ b/tex/context/base/mkii/supp-ali.mkii
diff --git a/tex/context/base/supp-box.mkii b/tex/context/base/mkii/supp-box.mkii
index 55641fd63..55641fd63 100644
--- a/tex/context/base/supp-box.mkii
+++ b/tex/context/base/mkii/supp-box.mkii
diff --git a/tex/context/base/supp-dir.mkii b/tex/context/base/mkii/supp-dir.mkii
index f4f294903..f4f294903 100644
--- a/tex/context/base/supp-dir.mkii
+++ b/tex/context/base/mkii/supp-dir.mkii
diff --git a/tex/context/base/supp-emp.mkii b/tex/context/base/mkii/supp-emp.mkii
index ba9e09e3a..ba9e09e3a 100644
--- a/tex/context/base/supp-emp.mkii
+++ b/tex/context/base/mkii/supp-emp.mkii
diff --git a/tex/context/base/supp-eps.mkii b/tex/context/base/mkii/supp-eps.mkii
index fb99469c5..fb99469c5 100644
--- a/tex/context/base/supp-eps.mkii
+++ b/tex/context/base/mkii/supp-eps.mkii
diff --git a/tex/context/base/supp-fil.mkii b/tex/context/base/mkii/supp-fil.mkii
index 9a981797e..9a981797e 100644
--- a/tex/context/base/supp-fil.mkii
+++ b/tex/context/base/mkii/supp-fil.mkii
diff --git a/tex/context/base/supp-fun.mkii b/tex/context/base/mkii/supp-fun.mkii
index 9bba4f5a8..9bba4f5a8 100644
--- a/tex/context/base/supp-fun.mkii
+++ b/tex/context/base/mkii/supp-fun.mkii
diff --git a/tex/context/base/supp-lat.mkii b/tex/context/base/mkii/supp-lat.mkii
index 343a7674c..343a7674c 100644
--- a/tex/context/base/supp-lat.mkii
+++ b/tex/context/base/mkii/supp-lat.mkii
diff --git a/tex/context/base/supp-mat.mkii b/tex/context/base/mkii/supp-mat.mkii
index e8a34fc90..e8a34fc90 100644
--- a/tex/context/base/supp-mat.mkii
+++ b/tex/context/base/mkii/supp-mat.mkii
diff --git a/tex/context/base/supp-mis.mkii b/tex/context/base/mkii/supp-mis.mkii
index bc511e518..bc511e518 100644
--- a/tex/context/base/supp-mis.mkii
+++ b/tex/context/base/mkii/supp-mis.mkii
diff --git a/tex/context/base/supp-mis.tex b/tex/context/base/mkii/supp-mis.tex
index bda8d4f6f..bda8d4f6f 100644
--- a/tex/context/base/supp-mis.tex
+++ b/tex/context/base/mkii/supp-mis.tex
diff --git a/tex/context/base/supp-mpe.mkii b/tex/context/base/mkii/supp-mpe.mkii
index 2e5e7e528..2e5e7e528 100644
--- a/tex/context/base/supp-mpe.mkii
+++ b/tex/context/base/mkii/supp-mpe.mkii
diff --git a/tex/context/base/supp-mpe.tex b/tex/context/base/mkii/supp-mpe.tex
index f4438133a..f4438133a 100644
--- a/tex/context/base/supp-mpe.tex
+++ b/tex/context/base/mkii/supp-mpe.tex
diff --git a/tex/context/base/supp-mps.mkii b/tex/context/base/mkii/supp-mps.mkii
index 3991280e6..3991280e6 100644
--- a/tex/context/base/supp-mps.mkii
+++ b/tex/context/base/mkii/supp-mps.mkii
diff --git a/tex/context/base/supp-mrk.mkii b/tex/context/base/mkii/supp-mrk.mkii
index b9d476c2a..b9d476c2a 100644
--- a/tex/context/base/supp-mrk.mkii
+++ b/tex/context/base/mkii/supp-mrk.mkii
diff --git a/tex/context/base/supp-num.mkii b/tex/context/base/mkii/supp-num.mkii
index 5e35a20b0..5e35a20b0 100644
--- a/tex/context/base/supp-num.mkii
+++ b/tex/context/base/mkii/supp-num.mkii
diff --git a/tex/context/base/supp-pat.mkii b/tex/context/base/mkii/supp-pat.mkii
index 425eae215..425eae215 100644
--- a/tex/context/base/supp-pat.mkii
+++ b/tex/context/base/mkii/supp-pat.mkii
diff --git a/tex/context/base/supp-pdf.mkii b/tex/context/base/mkii/supp-pdf.mkii
index 4dd2db776..4dd2db776 100644
--- a/tex/context/base/supp-pdf.mkii
+++ b/tex/context/base/mkii/supp-pdf.mkii
diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/mkii/supp-pdf.tex
index 2ae878067..2ae878067 100644
--- a/tex/context/base/supp-pdf.tex
+++ b/tex/context/base/mkii/supp-pdf.tex
diff --git a/tex/context/base/supp-ran.mkii b/tex/context/base/mkii/supp-ran.mkii
index 0a39026bf..0a39026bf 100644
--- a/tex/context/base/supp-ran.mkii
+++ b/tex/context/base/mkii/supp-ran.mkii
diff --git a/tex/context/base/supp-spe.mkii b/tex/context/base/mkii/supp-spe.mkii
index 4625695c7..4625695c7 100644
--- a/tex/context/base/supp-spe.mkii
+++ b/tex/context/base/mkii/supp-spe.mkii
diff --git a/tex/context/base/supp-tpi.mkii b/tex/context/base/mkii/supp-tpi.mkii
index 2c3e282e3..2c3e282e3 100644
--- a/tex/context/base/supp-tpi.mkii
+++ b/tex/context/base/mkii/supp-tpi.mkii
diff --git a/tex/context/base/supp-vis.mkii b/tex/context/base/mkii/supp-vis.mkii
index 22a745b13..22a745b13 100644
--- a/tex/context/base/supp-vis.mkii
+++ b/tex/context/base/mkii/supp-vis.mkii
diff --git a/tex/context/base/symb-cow.mkii b/tex/context/base/mkii/symb-cow.mkii
index 933a00c45..933a00c45 100644
--- a/tex/context/base/symb-cow.mkii
+++ b/tex/context/base/mkii/symb-cow.mkii
diff --git a/tex/context/base/symb-eur.mkii b/tex/context/base/mkii/symb-eur.mkii
index 67023ec91..67023ec91 100644
--- a/tex/context/base/symb-eur.mkii
+++ b/tex/context/base/mkii/symb-eur.mkii
diff --git a/tex/context/base/symb-glm.mkii b/tex/context/base/mkii/symb-glm.mkii
index ff94bfe7f..ff94bfe7f 100644
--- a/tex/context/base/symb-glm.mkii
+++ b/tex/context/base/mkii/symb-glm.mkii
diff --git a/tex/context/base/symb-ini.mkii b/tex/context/base/mkii/symb-ini.mkii
index 3154c8a04..3154c8a04 100644
--- a/tex/context/base/symb-ini.mkii
+++ b/tex/context/base/mkii/symb-ini.mkii
diff --git a/tex/context/base/symb-jmn.mkii b/tex/context/base/mkii/symb-jmn.mkii
index aea2dce7b..aea2dce7b 100644
--- a/tex/context/base/symb-jmn.mkii
+++ b/tex/context/base/mkii/symb-jmn.mkii
diff --git a/tex/context/base/symb-mis.mkii b/tex/context/base/mkii/symb-mis.mkii
index dacb816b4..dacb816b4 100644
--- a/tex/context/base/symb-mis.mkii
+++ b/tex/context/base/mkii/symb-mis.mkii
diff --git a/tex/context/base/symb-mvs.mkii b/tex/context/base/mkii/symb-mvs.mkii
index aae4e92d6..aae4e92d6 100644
--- a/tex/context/base/symb-mvs.mkii
+++ b/tex/context/base/mkii/symb-mvs.mkii
diff --git a/tex/context/base/symb-nav.mkii b/tex/context/base/mkii/symb-nav.mkii
index c9d1aae1d..c9d1aae1d 100644
--- a/tex/context/base/symb-nav.mkii
+++ b/tex/context/base/mkii/symb-nav.mkii
diff --git a/tex/context/base/symb-run.mkii b/tex/context/base/mkii/symb-run.mkii
index 8b8c62d8b..8b8c62d8b 100644
--- a/tex/context/base/symb-run.mkii
+++ b/tex/context/base/mkii/symb-run.mkii
diff --git a/tex/context/base/symb-uni.mkii b/tex/context/base/mkii/symb-uni.mkii
index f5435810f..f5435810f 100644
--- a/tex/context/base/symb-uni.mkii
+++ b/tex/context/base/mkii/symb-uni.mkii
diff --git a/tex/context/base/symb-was.mkii b/tex/context/base/mkii/symb-was.mkii
index e131cf04d..e131cf04d 100644
--- a/tex/context/base/symb-was.mkii
+++ b/tex/context/base/mkii/symb-was.mkii
diff --git a/tex/context/base/syst-con.mkii b/tex/context/base/mkii/syst-con.mkii
index c1ad788cf..c1ad788cf 100644
--- a/tex/context/base/syst-con.mkii
+++ b/tex/context/base/mkii/syst-con.mkii
diff --git a/tex/context/base/syst-ext.mkii b/tex/context/base/mkii/syst-ext.mkii
index 39f4145f2..39f4145f2 100644
--- a/tex/context/base/syst-ext.mkii
+++ b/tex/context/base/mkii/syst-ext.mkii
diff --git a/tex/context/base/syst-fnt.mkii b/tex/context/base/mkii/syst-fnt.mkii
index 5669475a6..5669475a6 100644
--- a/tex/context/base/syst-fnt.mkii
+++ b/tex/context/base/mkii/syst-fnt.mkii
diff --git a/tex/context/base/syst-gen.mkii b/tex/context/base/mkii/syst-gen.mkii
index 8b71b77d5..8b71b77d5 100644
--- a/tex/context/base/syst-gen.mkii
+++ b/tex/context/base/mkii/syst-gen.mkii
diff --git a/tex/context/base/syst-ini.mkii b/tex/context/base/mkii/syst-ini.mkii
index 7ae5f6c81..7ae5f6c81 100644
--- a/tex/context/base/syst-ini.mkii
+++ b/tex/context/base/mkii/syst-ini.mkii
diff --git a/tex/context/base/syst-new.mkii b/tex/context/base/mkii/syst-new.mkii
index 34b535b90..34b535b90 100644
--- a/tex/context/base/syst-new.mkii
+++ b/tex/context/base/mkii/syst-new.mkii
diff --git a/tex/context/base/syst-pln.mkii b/tex/context/base/mkii/syst-pln.mkii
index 1032b40b5..1032b40b5 100644
--- a/tex/context/base/syst-pln.mkii
+++ b/tex/context/base/mkii/syst-pln.mkii
diff --git a/tex/context/base/syst-rtp.mkii b/tex/context/base/mkii/syst-rtp.mkii
index fc0f503b0..fc0f503b0 100644
--- a/tex/context/base/syst-rtp.mkii
+++ b/tex/context/base/mkii/syst-rtp.mkii
diff --git a/tex/context/base/syst-rtp.mkiv b/tex/context/base/mkii/syst-rtp.mkiv
index 82c0778b4..82c0778b4 100644
--- a/tex/context/base/syst-rtp.mkiv
+++ b/tex/context/base/mkii/syst-rtp.mkiv
diff --git a/tex/context/base/syst-str.mkii b/tex/context/base/mkii/syst-str.mkii
index aacb70ec7..aacb70ec7 100644
--- a/tex/context/base/syst-str.mkii
+++ b/tex/context/base/mkii/syst-str.mkii
diff --git a/tex/context/base/syst-tex.mkii b/tex/context/base/mkii/syst-tex.mkii
index fee2b51b2..fee2b51b2 100644
--- a/tex/context/base/syst-tex.mkii
+++ b/tex/context/base/mkii/syst-tex.mkii
diff --git a/tex/context/base/tabl-com.mkii b/tex/context/base/mkii/tabl-com.mkii
index 8a0bb9e0c..8a0bb9e0c 100644
--- a/tex/context/base/tabl-com.mkii
+++ b/tex/context/base/mkii/tabl-com.mkii
diff --git a/tex/context/base/tabl-ltb.mkii b/tex/context/base/mkii/tabl-ltb.mkii
index bac2b5893..bac2b5893 100644
--- a/tex/context/base/tabl-ltb.mkii
+++ b/tex/context/base/mkii/tabl-ltb.mkii
diff --git a/tex/context/base/tabl-ntb.mkii b/tex/context/base/mkii/tabl-ntb.mkii
index fbf43eb1e..fbf43eb1e 100644
--- a/tex/context/base/tabl-ntb.mkii
+++ b/tex/context/base/mkii/tabl-ntb.mkii
diff --git a/tex/context/base/tabl-nte.mkii b/tex/context/base/mkii/tabl-nte.mkii
index 6a5391f24..6a5391f24 100644
--- a/tex/context/base/tabl-nte.mkii
+++ b/tex/context/base/mkii/tabl-nte.mkii
diff --git a/tex/context/base/tabl-pln.mkii b/tex/context/base/mkii/tabl-pln.mkii
index 39bb50f23..39bb50f23 100644
--- a/tex/context/base/tabl-pln.mkii
+++ b/tex/context/base/mkii/tabl-pln.mkii
diff --git a/tex/context/base/tabl-tab.mkii b/tex/context/base/mkii/tabl-tab.mkii
index 7909e5092..7909e5092 100644
--- a/tex/context/base/tabl-tab.mkii
+++ b/tex/context/base/mkii/tabl-tab.mkii
diff --git a/tex/context/base/tabl-tbl.mkii b/tex/context/base/mkii/tabl-tbl.mkii
index 9f2d7df47..9f2d7df47 100644
--- a/tex/context/base/tabl-tbl.mkii
+++ b/tex/context/base/mkii/tabl-tbl.mkii
diff --git a/tex/context/base/tabl-tsp.mkii b/tex/context/base/mkii/tabl-tsp.mkii
index 59e9185e8..59e9185e8 100644
--- a/tex/context/base/tabl-tsp.mkii
+++ b/tex/context/base/mkii/tabl-tsp.mkii
diff --git a/tex/context/base/thrd-pic.mkii b/tex/context/base/mkii/thrd-pic.mkii
index 3c25d8a81..3c25d8a81 100644
--- a/tex/context/base/thrd-pic.mkii
+++ b/tex/context/base/mkii/thrd-pic.mkii
diff --git a/tex/context/base/thrd-ran.mkii b/tex/context/base/mkii/thrd-ran.mkii
index 276a4f624..276a4f624 100644
--- a/tex/context/base/thrd-ran.mkii
+++ b/tex/context/base/mkii/thrd-ran.mkii
diff --git a/tex/context/base/thrd-tab.mkii b/tex/context/base/mkii/thrd-tab.mkii
index dd3838ce2..dd3838ce2 100644
--- a/tex/context/base/thrd-tab.mkii
+++ b/tex/context/base/mkii/thrd-tab.mkii
diff --git a/tex/context/base/thrd-trg.mkii b/tex/context/base/mkii/thrd-trg.mkii
index c0106f5a3..c0106f5a3 100644
--- a/tex/context/base/thrd-trg.mkii
+++ b/tex/context/base/mkii/thrd-trg.mkii
diff --git a/tex/context/base/trac-vis.mkii b/tex/context/base/mkii/trac-vis.mkii
index be7a204ec..be7a204ec 100644
--- a/tex/context/base/trac-vis.mkii
+++ b/tex/context/base/mkii/trac-vis.mkii
diff --git a/tex/context/base/type-def.mkii b/tex/context/base/mkii/type-def.mkii
index 0ff1e0b7d..0ff1e0b7d 100644
--- a/tex/context/base/type-def.mkii
+++ b/tex/context/base/mkii/type-def.mkii
diff --git a/tex/context/base/type-ini.mkii b/tex/context/base/mkii/type-ini.mkii
index c6b0a8931..c6b0a8931 100644
--- a/tex/context/base/type-ini.mkii
+++ b/tex/context/base/mkii/type-ini.mkii
diff --git a/tex/context/base/type-one.mkii b/tex/context/base/mkii/type-one.mkii
index 4f6e43745..4f6e43745 100644
--- a/tex/context/base/type-one.mkii
+++ b/tex/context/base/mkii/type-one.mkii
diff --git a/tex/context/base/type-otf.mkii b/tex/context/base/mkii/type-otf.mkii
index d15994f6a..d15994f6a 100644
--- a/tex/context/base/type-otf.mkii
+++ b/tex/context/base/mkii/type-otf.mkii
diff --git a/tex/context/base/type-run.mkii b/tex/context/base/mkii/type-run.mkii
index 51a9f2a88..51a9f2a88 100644
--- a/tex/context/base/type-run.mkii
+++ b/tex/context/base/mkii/type-run.mkii
diff --git a/tex/context/base/type-set.mkii b/tex/context/base/mkii/type-set.mkii
index 7f34deada..7f34deada 100644
--- a/tex/context/base/type-set.mkii
+++ b/tex/context/base/mkii/type-set.mkii
diff --git a/tex/context/base/type-siz.mkii b/tex/context/base/mkii/type-siz.mkii
index 4c3cfb28b..4c3cfb28b 100644
--- a/tex/context/base/type-siz.mkii
+++ b/tex/context/base/mkii/type-siz.mkii
diff --git a/tex/context/base/type-tmf.mkii b/tex/context/base/mkii/type-tmf.mkii
index 829b6baec..829b6baec 100644
--- a/tex/context/base/type-tmf.mkii
+++ b/tex/context/base/mkii/type-tmf.mkii
diff --git a/tex/context/base/typo-ini.mkii b/tex/context/base/mkii/typo-ini.mkii
index 6e19fb9b6..6e19fb9b6 100644
--- a/tex/context/base/typo-ini.mkii
+++ b/tex/context/base/mkii/typo-ini.mkii
diff --git a/tex/context/base/unic-000.mkii b/tex/context/base/mkii/unic-000.mkii
index 4ef570445..4ef570445 100644
--- a/tex/context/base/unic-000.mkii
+++ b/tex/context/base/mkii/unic-000.mkii
diff --git a/tex/context/base/unic-001.mkii b/tex/context/base/mkii/unic-001.mkii
index 198a8d98d..198a8d98d 100644
--- a/tex/context/base/unic-001.mkii
+++ b/tex/context/base/mkii/unic-001.mkii
diff --git a/tex/context/base/unic-002.mkii b/tex/context/base/mkii/unic-002.mkii
index 906975f86..906975f86 100644
--- a/tex/context/base/unic-002.mkii
+++ b/tex/context/base/mkii/unic-002.mkii
diff --git a/tex/context/base/unic-003.mkii b/tex/context/base/mkii/unic-003.mkii
index ad7d6df6a..ad7d6df6a 100644
--- a/tex/context/base/unic-003.mkii
+++ b/tex/context/base/mkii/unic-003.mkii
diff --git a/tex/context/base/unic-004.mkii b/tex/context/base/mkii/unic-004.mkii
index 7b413cdb9..7b413cdb9 100644
--- a/tex/context/base/unic-004.mkii
+++ b/tex/context/base/mkii/unic-004.mkii
diff --git a/tex/context/base/unic-005.mkii b/tex/context/base/mkii/unic-005.mkii
index e21edb205..e21edb205 100644
--- a/tex/context/base/unic-005.mkii
+++ b/tex/context/base/mkii/unic-005.mkii
diff --git a/tex/context/base/unic-030.mkii b/tex/context/base/mkii/unic-030.mkii
index 0065a738a..0065a738a 100644
--- a/tex/context/base/unic-030.mkii
+++ b/tex/context/base/mkii/unic-030.mkii
diff --git a/tex/context/base/unic-031.mkii b/tex/context/base/mkii/unic-031.mkii
index 68d163324..68d163324 100644
--- a/tex/context/base/unic-031.mkii
+++ b/tex/context/base/mkii/unic-031.mkii
diff --git a/tex/context/base/unic-032.mkii b/tex/context/base/mkii/unic-032.mkii
index 6bd176c80..6bd176c80 100644
--- a/tex/context/base/unic-032.mkii
+++ b/tex/context/base/mkii/unic-032.mkii
diff --git a/tex/context/base/unic-033.mkii b/tex/context/base/mkii/unic-033.mkii
index ad7a3b11f..ad7a3b11f 100644
--- a/tex/context/base/unic-033.mkii
+++ b/tex/context/base/mkii/unic-033.mkii
diff --git a/tex/context/base/unic-034.mkii b/tex/context/base/mkii/unic-034.mkii
index f998c5170..f998c5170 100644
--- a/tex/context/base/unic-034.mkii
+++ b/tex/context/base/mkii/unic-034.mkii
diff --git a/tex/context/base/unic-035.mkii b/tex/context/base/mkii/unic-035.mkii
index 0c9490174..0c9490174 100644
--- a/tex/context/base/unic-035.mkii
+++ b/tex/context/base/mkii/unic-035.mkii
diff --git a/tex/context/base/unic-037.mkii b/tex/context/base/mkii/unic-037.mkii
index 646a4afb2..646a4afb2 100644
--- a/tex/context/base/unic-037.mkii
+++ b/tex/context/base/mkii/unic-037.mkii
diff --git a/tex/context/base/unic-039.mkii b/tex/context/base/mkii/unic-039.mkii
index 02d5d3af2..02d5d3af2 100644
--- a/tex/context/base/unic-039.mkii
+++ b/tex/context/base/mkii/unic-039.mkii
diff --git a/tex/context/base/unic-251.mkii b/tex/context/base/mkii/unic-251.mkii
index 909cf5e94..909cf5e94 100644
--- a/tex/context/base/unic-251.mkii
+++ b/tex/context/base/mkii/unic-251.mkii
diff --git a/tex/context/base/unic-cjk.mkii b/tex/context/base/mkii/unic-cjk.mkii
index dc06e912c..dc06e912c 100644
--- a/tex/context/base/unic-cjk.mkii
+++ b/tex/context/base/mkii/unic-cjk.mkii
diff --git a/tex/context/base/unic-exp.mkii b/tex/context/base/mkii/unic-exp.mkii
index 4bdda3f6f..4bdda3f6f 100644
--- a/tex/context/base/unic-exp.mkii
+++ b/tex/context/base/mkii/unic-exp.mkii
diff --git a/tex/context/base/unic-ini.mkii b/tex/context/base/mkii/unic-ini.mkii
index 96aed77bc..96aed77bc 100644
--- a/tex/context/base/unic-ini.mkii
+++ b/tex/context/base/mkii/unic-ini.mkii
diff --git a/tex/context/base/unic-run.mkii b/tex/context/base/mkii/unic-run.mkii
index 96348d8a7..96348d8a7 100644
--- a/tex/context/base/unic-run.mkii
+++ b/tex/context/base/mkii/unic-run.mkii
diff --git a/tex/context/base/verb-c.mkii b/tex/context/base/mkii/verb-c.mkii
index 930977ca4..930977ca4 100644
--- a/tex/context/base/verb-c.mkii
+++ b/tex/context/base/mkii/verb-c.mkii
diff --git a/tex/context/base/verb-eif.mkii b/tex/context/base/mkii/verb-eif.mkii
index 68c84d4be..68c84d4be 100644
--- a/tex/context/base/verb-eif.mkii
+++ b/tex/context/base/mkii/verb-eif.mkii
diff --git a/tex/context/base/verb-ini.mkii b/tex/context/base/mkii/verb-ini.mkii
index 5a817b4bb..5a817b4bb 100644
--- a/tex/context/base/verb-ini.mkii
+++ b/tex/context/base/mkii/verb-ini.mkii
diff --git a/tex/context/base/verb-js.mkii b/tex/context/base/mkii/verb-js.mkii
index c249bd9bb..c249bd9bb 100644
--- a/tex/context/base/verb-js.mkii
+++ b/tex/context/base/mkii/verb-js.mkii
diff --git a/tex/context/base/verb-jv.mkii b/tex/context/base/mkii/verb-jv.mkii
index 2149c3a4a..2149c3a4a 100644
--- a/tex/context/base/verb-jv.mkii
+++ b/tex/context/base/mkii/verb-jv.mkii
diff --git a/tex/context/base/verb-mp.mkii b/tex/context/base/mkii/verb-mp.mkii
index aef52217d..aef52217d 100644
--- a/tex/context/base/verb-mp.mkii
+++ b/tex/context/base/mkii/verb-mp.mkii
diff --git a/tex/context/base/verb-pas.mkii b/tex/context/base/mkii/verb-pas.mkii
index 71c0b5a12..71c0b5a12 100644
--- a/tex/context/base/verb-pas.mkii
+++ b/tex/context/base/mkii/verb-pas.mkii
diff --git a/tex/context/base/verb-pl.mkii b/tex/context/base/mkii/verb-pl.mkii
index 634a0a314..634a0a314 100644
--- a/tex/context/base/verb-pl.mkii
+++ b/tex/context/base/mkii/verb-pl.mkii
diff --git a/tex/context/base/verb-raw.mkii b/tex/context/base/mkii/verb-raw.mkii
index 43a0891a0..43a0891a0 100644
--- a/tex/context/base/verb-raw.mkii
+++ b/tex/context/base/mkii/verb-raw.mkii
diff --git a/tex/context/base/verb-sql.mkii b/tex/context/base/mkii/verb-sql.mkii
index f145607f8..f145607f8 100644
--- a/tex/context/base/verb-sql.mkii
+++ b/tex/context/base/mkii/verb-sql.mkii
diff --git a/tex/context/base/verb-tex.mkii b/tex/context/base/mkii/verb-tex.mkii
index 98655cc2d..98655cc2d 100644
--- a/tex/context/base/verb-tex.mkii
+++ b/tex/context/base/mkii/verb-tex.mkii
diff --git a/tex/context/base/verb-xml.mkii b/tex/context/base/mkii/verb-xml.mkii
index dbf6635f6..dbf6635f6 100644
--- a/tex/context/base/verb-xml.mkii
+++ b/tex/context/base/mkii/verb-xml.mkii
diff --git a/tex/context/base/xetx-chr.mkii b/tex/context/base/mkii/xetx-chr.mkii
index ca9c4aaa4..ca9c4aaa4 100644
--- a/tex/context/base/xetx-chr.mkii
+++ b/tex/context/base/mkii/xetx-chr.mkii
diff --git a/tex/context/base/xetx-cls.mkii b/tex/context/base/mkii/xetx-cls.mkii
index 9142f39e5..9142f39e5 100644
--- a/tex/context/base/xetx-cls.mkii
+++ b/tex/context/base/mkii/xetx-cls.mkii
diff --git a/tex/context/base/xetx-ini.mkii b/tex/context/base/mkii/xetx-ini.mkii
index 55155fa1a..55155fa1a 100644
--- a/tex/context/base/xetx-ini.mkii
+++ b/tex/context/base/mkii/xetx-ini.mkii
diff --git a/tex/context/base/xetx-utf.mkii b/tex/context/base/mkii/xetx-utf.mkii
index a157a2d11..a157a2d11 100644
--- a/tex/context/base/xetx-utf.mkii
+++ b/tex/context/base/mkii/xetx-utf.mkii
diff --git a/tex/context/base/xtag-cml.mkii b/tex/context/base/mkii/xtag-cml.mkii
index 6da7fd26f..6da7fd26f 100644
--- a/tex/context/base/xtag-cml.mkii
+++ b/tex/context/base/mkii/xtag-cml.mkii
diff --git a/tex/context/base/xtag-ent.mkii b/tex/context/base/mkii/xtag-ent.mkii
index 09051d0b4..09051d0b4 100644
--- a/tex/context/base/xtag-ent.mkii
+++ b/tex/context/base/mkii/xtag-ent.mkii
diff --git a/tex/context/base/xtag-exp.mkii b/tex/context/base/mkii/xtag-exp.mkii
index 9ecfcc5b1..9ecfcc5b1 100644
--- a/tex/context/base/xtag-exp.mkii
+++ b/tex/context/base/mkii/xtag-exp.mkii
diff --git a/tex/context/base/xtag-ext.mkii b/tex/context/base/mkii/xtag-ext.mkii
index 60615b1c2..60615b1c2 100644
--- a/tex/context/base/xtag-ext.mkii
+++ b/tex/context/base/mkii/xtag-ext.mkii
diff --git a/tex/context/base/xtag-hyp.mkii b/tex/context/base/mkii/xtag-hyp.mkii
index 105f1a1e3..105f1a1e3 100644
--- a/tex/context/base/xtag-hyp.mkii
+++ b/tex/context/base/mkii/xtag-hyp.mkii
diff --git a/tex/context/base/xtag-ini.mkii b/tex/context/base/mkii/xtag-ini.mkii
index ce3cbacd0..ce3cbacd0 100644
--- a/tex/context/base/xtag-ini.mkii
+++ b/tex/context/base/mkii/xtag-ini.mkii
diff --git a/tex/context/base/xtag-map.mkii b/tex/context/base/mkii/xtag-map.mkii
index 4f639bf01..4f639bf01 100644
--- a/tex/context/base/xtag-map.mkii
+++ b/tex/context/base/mkii/xtag-map.mkii
diff --git a/tex/context/base/xtag-mea.mkii b/tex/context/base/mkii/xtag-mea.mkii
index d56d6c54b..d56d6c54b 100644
--- a/tex/context/base/xtag-mea.mkii
+++ b/tex/context/base/mkii/xtag-mea.mkii
diff --git a/tex/context/base/xtag-meb.mkii b/tex/context/base/mkii/xtag-meb.mkii
index ba370cadf..ba370cadf 100644
--- a/tex/context/base/xtag-meb.mkii
+++ b/tex/context/base/mkii/xtag-meb.mkii
diff --git a/tex/context/base/xtag-mec.mkii b/tex/context/base/mkii/xtag-mec.mkii
index 9e941897c..9e941897c 100644
--- a/tex/context/base/xtag-mec.mkii
+++ b/tex/context/base/mkii/xtag-mec.mkii
diff --git a/tex/context/base/xtag-meh.mkii b/tex/context/base/mkii/xtag-meh.mkii
index 1636f2a2b..1636f2a2b 100644
--- a/tex/context/base/xtag-meh.mkii
+++ b/tex/context/base/mkii/xtag-meh.mkii
diff --git a/tex/context/base/xtag-men.mkii b/tex/context/base/mkii/xtag-men.mkii
index d548c8394..d548c8394 100644
--- a/tex/context/base/xtag-men.mkii
+++ b/tex/context/base/mkii/xtag-men.mkii
diff --git a/tex/context/base/xtag-meo.mkii b/tex/context/base/mkii/xtag-meo.mkii
index f19f80fbe..f19f80fbe 100644
--- a/tex/context/base/xtag-meo.mkii
+++ b/tex/context/base/mkii/xtag-meo.mkii
diff --git a/tex/context/base/xtag-mer.mkii b/tex/context/base/mkii/xtag-mer.mkii
index becff584a..becff584a 100644
--- a/tex/context/base/xtag-mer.mkii
+++ b/tex/context/base/mkii/xtag-mer.mkii
diff --git a/tex/context/base/xtag-mmc.mkii b/tex/context/base/mkii/xtag-mmc.mkii
index 9da7fef84..9da7fef84 100644
--- a/tex/context/base/xtag-mmc.mkii
+++ b/tex/context/base/mkii/xtag-mmc.mkii
diff --git a/tex/context/base/xtag-mml.mkii b/tex/context/base/mkii/xtag-mml.mkii
index f948128fa..f948128fa 100644
--- a/tex/context/base/xtag-mml.mkii
+++ b/tex/context/base/mkii/xtag-mml.mkii
diff --git a/tex/context/base/xtag-mmp.mkii b/tex/context/base/mkii/xtag-mmp.mkii
index 93f0a1504..93f0a1504 100644
--- a/tex/context/base/xtag-mmp.mkii
+++ b/tex/context/base/mkii/xtag-mmp.mkii
diff --git a/tex/context/base/xtag-mxa.mkii b/tex/context/base/mkii/xtag-mxa.mkii
index 5e83367df..5e83367df 100644
--- a/tex/context/base/xtag-mxa.mkii
+++ b/tex/context/base/mkii/xtag-mxa.mkii
diff --git a/tex/context/base/xtag-mxb.mkii b/tex/context/base/mkii/xtag-mxb.mkii
index c325a9e44..c325a9e44 100644
--- a/tex/context/base/xtag-mxb.mkii
+++ b/tex/context/base/mkii/xtag-mxb.mkii
diff --git a/tex/context/base/xtag-mxc.mkii b/tex/context/base/mkii/xtag-mxc.mkii
index e692f2a24..e692f2a24 100644
--- a/tex/context/base/xtag-mxc.mkii
+++ b/tex/context/base/mkii/xtag-mxc.mkii
diff --git a/tex/context/base/xtag-mxh.mkii b/tex/context/base/mkii/xtag-mxh.mkii
index 3cf0103c8..3cf0103c8 100644
--- a/tex/context/base/xtag-mxh.mkii
+++ b/tex/context/base/mkii/xtag-mxh.mkii
diff --git a/tex/context/base/xtag-mxn.mkii b/tex/context/base/mkii/xtag-mxn.mkii
index 35eeade9a..35eeade9a 100644
--- a/tex/context/base/xtag-mxn.mkii
+++ b/tex/context/base/mkii/xtag-mxn.mkii
diff --git a/tex/context/base/xtag-mxo.mkii b/tex/context/base/mkii/xtag-mxo.mkii
index 045b4f406..045b4f406 100644
--- a/tex/context/base/xtag-mxo.mkii
+++ b/tex/context/base/mkii/xtag-mxo.mkii
diff --git a/tex/context/base/xtag-mxr.mkii b/tex/context/base/mkii/xtag-mxr.mkii
index ed1498f81..ed1498f81 100644
--- a/tex/context/base/xtag-mxr.mkii
+++ b/tex/context/base/mkii/xtag-mxr.mkii
diff --git a/tex/context/base/xtag-pml.mkii b/tex/context/base/mkii/xtag-pml.mkii
index a0930b634..a0930b634 100644
--- a/tex/context/base/xtag-pml.mkii
+++ b/tex/context/base/mkii/xtag-pml.mkii
diff --git a/tex/context/base/xtag-pmu.mkii b/tex/context/base/mkii/xtag-pmu.mkii
index 5c7c9a8f6..5c7c9a8f6 100644
--- a/tex/context/base/xtag-pmu.mkii
+++ b/tex/context/base/mkii/xtag-pmu.mkii
diff --git a/tex/context/base/xtag-pre.mkii b/tex/context/base/mkii/xtag-pre.mkii
index 5e75197b7..5e75197b7 100644
--- a/tex/context/base/xtag-pre.mkii
+++ b/tex/context/base/mkii/xtag-pre.mkii
diff --git a/tex/context/base/xtag-prs.mkii b/tex/context/base/mkii/xtag-prs.mkii
index 8728d992a..8728d992a 100644
--- a/tex/context/base/xtag-prs.mkii
+++ b/tex/context/base/mkii/xtag-prs.mkii
diff --git a/tex/context/base/xtag-raw.mkii b/tex/context/base/mkii/xtag-raw.mkii
index aab294c5a..aab294c5a 100644
--- a/tex/context/base/xtag-raw.mkii
+++ b/tex/context/base/mkii/xtag-raw.mkii
diff --git a/tex/context/base/xtag-rng.mkii b/tex/context/base/mkii/xtag-rng.mkii
index 4b9dcfaf1..4b9dcfaf1 100644
--- a/tex/context/base/xtag-rng.mkii
+++ b/tex/context/base/mkii/xtag-rng.mkii
diff --git a/tex/context/base/xtag-run.mkii b/tex/context/base/mkii/xtag-run.mkii
index 65424650c..65424650c 100644
--- a/tex/context/base/xtag-run.mkii
+++ b/tex/context/base/mkii/xtag-run.mkii
diff --git a/tex/context/base/xtag-stk.mkii b/tex/context/base/mkii/xtag-stk.mkii
index d454a63ca..d454a63ca 100644
--- a/tex/context/base/xtag-stk.mkii
+++ b/tex/context/base/mkii/xtag-stk.mkii
diff --git a/tex/context/base/xtag-utf.mkii b/tex/context/base/mkii/xtag-utf.mkii
index b58fbbe88..b58fbbe88 100644
--- a/tex/context/base/xtag-utf.mkii
+++ b/tex/context/base/mkii/xtag-utf.mkii
diff --git a/tex/context/base/xtag-xsd.mkii b/tex/context/base/mkii/xtag-xsd.mkii
index c1f4b91b6..c1f4b91b6 100644
--- a/tex/context/base/xtag-xsd.mkii
+++ b/tex/context/base/mkii/xtag-xsd.mkii
diff --git a/tex/context/base/xtag-xsl.mkii b/tex/context/base/mkii/xtag-xsl.mkii
index 49767e30c..49767e30c 100644
--- a/tex/context/base/xtag-xsl.mkii
+++ b/tex/context/base/mkii/xtag-xsl.mkii
diff --git a/tex/context/base/anch-bar.mkiv b/tex/context/base/mkiv/anch-bar.mkiv
index b5df21a07..b5df21a07 100644
--- a/tex/context/base/anch-bar.mkiv
+++ b/tex/context/base/mkiv/anch-bar.mkiv
diff --git a/tex/context/base/anch-bck.mkvi b/tex/context/base/mkiv/anch-bck.mkvi
index ee392f114..ee392f114 100644
--- a/tex/context/base/anch-bck.mkvi
+++ b/tex/context/base/mkiv/anch-bck.mkvi
diff --git a/tex/context/base/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua
index b5c2ae628..b5c2ae628 100644
--- a/tex/context/base/anch-pgr.lua
+++ b/tex/context/base/mkiv/anch-pgr.lua
diff --git a/tex/context/base/anch-pgr.mkiv b/tex/context/base/mkiv/anch-pgr.mkiv
index a7ad26dff..a7ad26dff 100644
--- a/tex/context/base/anch-pgr.mkiv
+++ b/tex/context/base/mkiv/anch-pgr.mkiv
diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/mkiv/anch-pos.lua
index c01e90179..c01e90179 100644
--- a/tex/context/base/anch-pos.lua
+++ b/tex/context/base/mkiv/anch-pos.lua
diff --git a/tex/context/base/anch-pos.mkiv b/tex/context/base/mkiv/anch-pos.mkiv
index 5d9c2fd34..5d9c2fd34 100644
--- a/tex/context/base/anch-pos.mkiv
+++ b/tex/context/base/mkiv/anch-pos.mkiv
diff --git a/tex/context/base/anch-snc.mkiv b/tex/context/base/mkiv/anch-snc.mkiv
index d0d3a58d1..d0d3a58d1 100644
--- a/tex/context/base/anch-snc.mkiv
+++ b/tex/context/base/mkiv/anch-snc.mkiv
diff --git a/tex/context/base/anch-tab.mkiv b/tex/context/base/mkiv/anch-tab.mkiv
index 7e0116cbf..7e0116cbf 100644
--- a/tex/context/base/anch-tab.mkiv
+++ b/tex/context/base/mkiv/anch-tab.mkiv
diff --git a/tex/context/base/attr-col.lua b/tex/context/base/mkiv/attr-col.lua
index 6b11333a7..6b11333a7 100644
--- a/tex/context/base/attr-col.lua
+++ b/tex/context/base/mkiv/attr-col.lua
diff --git a/tex/context/base/attr-col.mkiv b/tex/context/base/mkiv/attr-col.mkiv
index 6231755e9..6231755e9 100644
--- a/tex/context/base/attr-col.mkiv
+++ b/tex/context/base/mkiv/attr-col.mkiv
diff --git a/tex/context/base/attr-eff.lua b/tex/context/base/mkiv/attr-eff.lua
index ff41e12de..ff41e12de 100644
--- a/tex/context/base/attr-eff.lua
+++ b/tex/context/base/mkiv/attr-eff.lua
diff --git a/tex/context/base/attr-eff.mkiv b/tex/context/base/mkiv/attr-eff.mkiv
index 859814ebc..859814ebc 100644
--- a/tex/context/base/attr-eff.mkiv
+++ b/tex/context/base/mkiv/attr-eff.mkiv
diff --git a/tex/context/base/attr-ini.lua b/tex/context/base/mkiv/attr-ini.lua
index df7404d11..df7404d11 100644
--- a/tex/context/base/attr-ini.lua
+++ b/tex/context/base/mkiv/attr-ini.lua
diff --git a/tex/context/base/attr-ini.mkiv b/tex/context/base/mkiv/attr-ini.mkiv
index 3f0b7fb27..3f0b7fb27 100644
--- a/tex/context/base/attr-ini.mkiv
+++ b/tex/context/base/mkiv/attr-ini.mkiv
diff --git a/tex/context/base/attr-lay.lua b/tex/context/base/mkiv/attr-lay.lua
index 0d43979c8..0d43979c8 100644
--- a/tex/context/base/attr-lay.lua
+++ b/tex/context/base/mkiv/attr-lay.lua
diff --git a/tex/context/base/attr-lay.mkiv b/tex/context/base/mkiv/attr-lay.mkiv
index 14ef4a6d4..14ef4a6d4 100644
--- a/tex/context/base/attr-lay.mkiv
+++ b/tex/context/base/mkiv/attr-lay.mkiv
diff --git a/tex/context/base/attr-mkr.lua b/tex/context/base/mkiv/attr-mkr.lua
index 976598fa0..976598fa0 100644
--- a/tex/context/base/attr-mkr.lua
+++ b/tex/context/base/mkiv/attr-mkr.lua
diff --git a/tex/context/base/attr-mkr.mkiv b/tex/context/base/mkiv/attr-mkr.mkiv
index c8818ebae..c8818ebae 100644
--- a/tex/context/base/attr-mkr.mkiv
+++ b/tex/context/base/mkiv/attr-mkr.mkiv
diff --git a/tex/context/base/attr-neg.lua b/tex/context/base/mkiv/attr-neg.lua
index 1347c3d1a..1347c3d1a 100644
--- a/tex/context/base/attr-neg.lua
+++ b/tex/context/base/mkiv/attr-neg.lua
diff --git a/tex/context/base/attr-neg.mkiv b/tex/context/base/mkiv/attr-neg.mkiv
index ff1f52a96..ff1f52a96 100644
--- a/tex/context/base/attr-neg.mkiv
+++ b/tex/context/base/mkiv/attr-neg.mkiv
diff --git a/tex/context/base/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index 5390911bb..5390911bb 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
diff --git a/tex/context/base/back-exp.mkiv b/tex/context/base/mkiv/back-exp.mkiv
index 6a8177faf..6a8177faf 100644
--- a/tex/context/base/back-exp.mkiv
+++ b/tex/context/base/mkiv/back-exp.mkiv
diff --git a/tex/context/base/back-ini.lua b/tex/context/base/mkiv/back-ini.lua
index e8af4d9d9..e8af4d9d9 100644
--- a/tex/context/base/back-ini.lua
+++ b/tex/context/base/mkiv/back-ini.lua
diff --git a/tex/context/base/back-ini.mkiv b/tex/context/base/mkiv/back-ini.mkiv
index 9859f026a..9859f026a 100644
--- a/tex/context/base/back-ini.mkiv
+++ b/tex/context/base/mkiv/back-ini.mkiv
diff --git a/tex/context/base/back-pdf.lua b/tex/context/base/mkiv/back-pdf.lua
index 5d007ed43..5d007ed43 100644
--- a/tex/context/base/back-pdf.lua
+++ b/tex/context/base/mkiv/back-pdf.lua
diff --git a/tex/context/base/back-pdf.mkiv b/tex/context/base/mkiv/back-pdf.mkiv
index cc2284e79..79f9ed353 100644
--- a/tex/context/base/back-pdf.mkiv
+++ b/tex/context/base/mkiv/back-pdf.mkiv
@@ -229,15 +229,15 @@
 %def\TransparencyHack{\ctxlua{backends.codeinjections.addtransparencygroup()}}
 \def\TransparencyHack{\setupcolors[\c!pagecolormodel=\v!auto]}
 
-\let\lastpredefinedsymbol\empty % some day we can do more at the lua end
-
-\unexpanded\def\predefinesymbol[#1]%
-  {\begingroup
-   \xdef\lastpredefinedsymbol{#1}%
-   \settightobject{SYM}{#1}\hbox{\symbol[#1]}% to be checked ... maybe only fitting
-   \dogetobjectreference{SYM}{#1}\m_back_object_reference
-   \clf_registerbackendsymbol{#1}\m_back_object_reference\relax
-   \endgroup}
+% \let\lastpredefinedsymbol\empty % some day we can do more at the lua end
+%
+% \unexpanded\def\predefinesymbol[#1]%
+%   {\begingroup
+%    \xdef\lastpredefinedsymbol{#1}%
+%    \settightobject{SYM}{#1}\hbox{\symbol[#1]}% to be checked ... maybe only fitting
+%    \dogetobjectreference{SYM}{#1}\m_back_object_reference
+%    \clf_registerbackendsymbol{#1}\m_back_object_reference\relax
+%    \endgroup}
 
 % Still here:
 
diff --git a/tex/context/base/back-swf.mkiv b/tex/context/base/mkiv/back-swf.mkiv
index 09745e0f9..09745e0f9 100644
--- a/tex/context/base/back-swf.mkiv
+++ b/tex/context/base/mkiv/back-swf.mkiv
diff --git a/tex/context/base/back-u3d.mkiv b/tex/context/base/mkiv/back-u3d.mkiv
index 297dd5545..297dd5545 100644
--- a/tex/context/base/back-u3d.mkiv
+++ b/tex/context/base/mkiv/back-u3d.mkiv
diff --git a/tex/context/base/bibl-bib.lua b/tex/context/base/mkiv/bibl-bib.lua
index baeb3d2f9..baeb3d2f9 100644
--- a/tex/context/base/bibl-bib.lua
+++ b/tex/context/base/mkiv/bibl-bib.lua
diff --git a/tex/context/base/bibl-bib.mkiv b/tex/context/base/mkiv/bibl-bib.mkiv
index 80d04099b..80d04099b 100644
--- a/tex/context/base/bibl-bib.mkiv
+++ b/tex/context/base/mkiv/bibl-bib.mkiv
diff --git a/tex/context/base/bibl-tra.lua b/tex/context/base/mkiv/bibl-tra.lua
index 223554b4d..223554b4d 100644
--- a/tex/context/base/bibl-tra.lua
+++ b/tex/context/base/mkiv/bibl-tra.lua
diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/mkiv/bibl-tra.mkiv
index 4c9e83fdf..4c9e83fdf 100644
--- a/tex/context/base/bibl-tra.mkiv
+++ b/tex/context/base/mkiv/bibl-tra.mkiv
diff --git a/tex/context/base/bibl-tst.lua b/tex/context/base/mkiv/bibl-tst.lua
index 5ff8f4570..5ff8f4570 100644
--- a/tex/context/base/bibl-tst.lua
+++ b/tex/context/base/mkiv/bibl-tst.lua
diff --git a/tex/context/base/blob-ini.lua b/tex/context/base/mkiv/blob-ini.lua
index b837250ce..b837250ce 100644
--- a/tex/context/base/blob-ini.lua
+++ b/tex/context/base/mkiv/blob-ini.lua
diff --git a/tex/context/base/blob-ini.mkiv b/tex/context/base/mkiv/blob-ini.mkiv
index 64582c0db..64582c0db 100644
--- a/tex/context/base/blob-ini.mkiv
+++ b/tex/context/base/mkiv/blob-ini.mkiv
diff --git a/tex/context/base/buff-imp-default.lua b/tex/context/base/mkiv/buff-imp-default.lua
index 79f01c47d..79f01c47d 100644
--- a/tex/context/base/buff-imp-default.lua
+++ b/tex/context/base/mkiv/buff-imp-default.lua
diff --git a/tex/context/base/buff-imp-default.mkiv b/tex/context/base/mkiv/buff-imp-default.mkiv
index 5cff34c70..5cff34c70 100644
--- a/tex/context/base/buff-imp-default.mkiv
+++ b/tex/context/base/mkiv/buff-imp-default.mkiv
diff --git a/tex/context/base/buff-imp-escaped.lua b/tex/context/base/mkiv/buff-imp-escaped.lua
index 159921e2a..159921e2a 100644
--- a/tex/context/base/buff-imp-escaped.lua
+++ b/tex/context/base/mkiv/buff-imp-escaped.lua
diff --git a/tex/context/base/buff-imp-escaped.mkiv b/tex/context/base/mkiv/buff-imp-escaped.mkiv
index 13850475a..13850475a 100644
--- a/tex/context/base/buff-imp-escaped.mkiv
+++ b/tex/context/base/mkiv/buff-imp-escaped.mkiv
diff --git a/tex/context/base/buff-imp-lua.lua b/tex/context/base/mkiv/buff-imp-lua.lua
index e873a34d1..e873a34d1 100644
--- a/tex/context/base/buff-imp-lua.lua
+++ b/tex/context/base/mkiv/buff-imp-lua.lua
diff --git a/tex/context/base/buff-imp-lua.mkiv b/tex/context/base/mkiv/buff-imp-lua.mkiv
index dc601bd7b..dc601bd7b 100644
--- a/tex/context/base/buff-imp-lua.mkiv
+++ b/tex/context/base/mkiv/buff-imp-lua.mkiv
diff --git a/tex/context/base/buff-imp-mp.lua b/tex/context/base/mkiv/buff-imp-mp.lua
index bcd18dd47..bcd18dd47 100644
--- a/tex/context/base/buff-imp-mp.lua
+++ b/tex/context/base/mkiv/buff-imp-mp.lua
diff --git a/tex/context/base/buff-imp-mp.mkiv b/tex/context/base/mkiv/buff-imp-mp.mkiv
index a40eb6c30..a40eb6c30 100644
--- a/tex/context/base/buff-imp-mp.mkiv
+++ b/tex/context/base/mkiv/buff-imp-mp.mkiv
diff --git a/tex/context/base/buff-imp-nested.lua b/tex/context/base/mkiv/buff-imp-nested.lua
index 019cd996d..019cd996d 100644
--- a/tex/context/base/buff-imp-nested.lua
+++ b/tex/context/base/mkiv/buff-imp-nested.lua
diff --git a/tex/context/base/buff-imp-nested.mkiv b/tex/context/base/mkiv/buff-imp-nested.mkiv
index 7815086db..7815086db 100644
--- a/tex/context/base/buff-imp-nested.mkiv
+++ b/tex/context/base/mkiv/buff-imp-nested.mkiv
diff --git a/tex/context/base/buff-imp-parsed-xml.lua b/tex/context/base/mkiv/buff-imp-parsed-xml.lua
index 22611ac8a..22611ac8a 100644
--- a/tex/context/base/buff-imp-parsed-xml.lua
+++ b/tex/context/base/mkiv/buff-imp-parsed-xml.lua
diff --git a/tex/context/base/buff-imp-parsed-xml.mkiv b/tex/context/base/mkiv/buff-imp-parsed-xml.mkiv
index bd348a67d..bd348a67d 100644
--- a/tex/context/base/buff-imp-parsed-xml.mkiv
+++ b/tex/context/base/mkiv/buff-imp-parsed-xml.mkiv
diff --git a/tex/context/base/buff-imp-tex.lua b/tex/context/base/mkiv/buff-imp-tex.lua
index 097dff212..097dff212 100644
--- a/tex/context/base/buff-imp-tex.lua
+++ b/tex/context/base/mkiv/buff-imp-tex.lua
diff --git a/tex/context/base/buff-imp-tex.mkiv b/tex/context/base/mkiv/buff-imp-tex.mkiv
index c582523d5..c582523d5 100644
--- a/tex/context/base/buff-imp-tex.mkiv
+++ b/tex/context/base/mkiv/buff-imp-tex.mkiv
diff --git a/tex/context/base/buff-imp-xml.lua b/tex/context/base/mkiv/buff-imp-xml.lua
index 0c48ed3b0..0c48ed3b0 100644
--- a/tex/context/base/buff-imp-xml.lua
+++ b/tex/context/base/mkiv/buff-imp-xml.lua
diff --git a/tex/context/base/buff-imp-xml.mkiv b/tex/context/base/mkiv/buff-imp-xml.mkiv
index f880ab882..f880ab882 100644
--- a/tex/context/base/buff-imp-xml.mkiv
+++ b/tex/context/base/mkiv/buff-imp-xml.mkiv
diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/mkiv/buff-ini.lua
index 1caf3b752..1caf3b752 100644
--- a/tex/context/base/buff-ini.lua
+++ b/tex/context/base/mkiv/buff-ini.lua
diff --git a/tex/context/base/buff-ini.mkiv b/tex/context/base/mkiv/buff-ini.mkiv
index 7cc6cdbd4..7cc6cdbd4 100644
--- a/tex/context/base/buff-ini.mkiv
+++ b/tex/context/base/mkiv/buff-ini.mkiv
diff --git a/tex/context/base/buff-par.lua b/tex/context/base/mkiv/buff-par.lua
index 58ea9ab9d..58ea9ab9d 100644
--- a/tex/context/base/buff-par.lua
+++ b/tex/context/base/mkiv/buff-par.lua
diff --git a/tex/context/base/buff-par.mkvi b/tex/context/base/mkiv/buff-par.mkvi
index b17edb173..b17edb173 100644
--- a/tex/context/base/buff-par.mkvi
+++ b/tex/context/base/mkiv/buff-par.mkvi
diff --git a/tex/context/base/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index 0168c551d..0168c551d 100644
--- a/tex/context/base/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv
index dbb675320..dbb675320 100644
--- a/tex/context/base/buff-ver.mkiv
+++ b/tex/context/base/mkiv/buff-ver.mkiv
diff --git a/tex/context/base/bxml-apa.mkiv b/tex/context/base/mkiv/bxml-apa.mkiv
index 6513a71c2..6513a71c2 100644
--- a/tex/context/base/bxml-apa.mkiv
+++ b/tex/context/base/mkiv/bxml-apa.mkiv
diff --git a/tex/context/base/catc-act.mkiv b/tex/context/base/mkiv/catc-act.mkiv
index bd1ffd38d..bd1ffd38d 100644
--- a/tex/context/base/catc-act.mkiv
+++ b/tex/context/base/mkiv/catc-act.mkiv
diff --git a/tex/context/base/catc-ctx.mkiv b/tex/context/base/mkiv/catc-ctx.mkiv
index 5af8a5035..5af8a5035 100644
--- a/tex/context/base/catc-ctx.mkiv
+++ b/tex/context/base/mkiv/catc-ctx.mkiv
diff --git a/tex/context/base/catc-def.mkiv b/tex/context/base/mkiv/catc-def.mkiv
index bf794f045..bf794f045 100644
--- a/tex/context/base/catc-def.mkiv
+++ b/tex/context/base/mkiv/catc-def.mkiv
diff --git a/tex/context/base/catc-ini.lua b/tex/context/base/mkiv/catc-ini.lua
index 9241f5a1b..9241f5a1b 100644
--- a/tex/context/base/catc-ini.lua
+++ b/tex/context/base/mkiv/catc-ini.lua
diff --git a/tex/context/base/catc-ini.mkiv b/tex/context/base/mkiv/catc-ini.mkiv
index 26cf17edf..26cf17edf 100644
--- a/tex/context/base/catc-ini.mkiv
+++ b/tex/context/base/mkiv/catc-ini.mkiv
diff --git a/tex/context/base/catc-sym.mkiv b/tex/context/base/mkiv/catc-sym.mkiv
index ae1253272..ae1253272 100644
--- a/tex/context/base/catc-sym.mkiv
+++ b/tex/context/base/mkiv/catc-sym.mkiv
diff --git a/tex/context/base/catc-xml.mkiv b/tex/context/base/mkiv/catc-xml.mkiv
index a23a2fe0a..a23a2fe0a 100644
--- a/tex/context/base/catc-xml.mkiv
+++ b/tex/context/base/mkiv/catc-xml.mkiv
diff --git a/tex/context/base/char-act.mkiv b/tex/context/base/mkiv/char-act.mkiv
index 7d7268c8b..7d7268c8b 100644
--- a/tex/context/base/char-act.mkiv
+++ b/tex/context/base/mkiv/char-act.mkiv
diff --git a/tex/context/base/char-cjk.lua b/tex/context/base/mkiv/char-cjk.lua
index 42fb49555..42fb49555 100644
--- a/tex/context/base/char-cjk.lua
+++ b/tex/context/base/mkiv/char-cjk.lua
diff --git a/tex/context/base/char-def.lua b/tex/context/base/mkiv/char-def.lua
index 26c9c9e8c..26c9c9e8c 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/mkiv/char-def.lua
diff --git a/tex/context/base/char-enc.lua b/tex/context/base/mkiv/char-enc.lua
index c2061891a..c2061891a 100644
--- a/tex/context/base/char-enc.lua
+++ b/tex/context/base/mkiv/char-enc.lua
diff --git a/tex/context/base/char-enc.mkiv b/tex/context/base/mkiv/char-enc.mkiv
index 86ab2591a..86ab2591a 100644
--- a/tex/context/base/char-enc.mkiv
+++ b/tex/context/base/mkiv/char-enc.mkiv
diff --git a/tex/context/base/char-ent.lua b/tex/context/base/mkiv/char-ent.lua
index e48856a84..e48856a84 100644
--- a/tex/context/base/char-ent.lua
+++ b/tex/context/base/mkiv/char-ent.lua
diff --git a/tex/context/base/char-fio.lua b/tex/context/base/mkiv/char-fio.lua
index ab2555935..ab2555935 100644
--- a/tex/context/base/char-fio.lua
+++ b/tex/context/base/mkiv/char-fio.lua
diff --git a/tex/context/base/char-ini.lua b/tex/context/base/mkiv/char-ini.lua
index b59c9db6d..b59c9db6d 100644
--- a/tex/context/base/char-ini.lua
+++ b/tex/context/base/mkiv/char-ini.lua
diff --git a/tex/context/base/char-ini.mkiv b/tex/context/base/mkiv/char-ini.mkiv
index 95ff7af5a..95ff7af5a 100644
--- a/tex/context/base/char-ini.mkiv
+++ b/tex/context/base/mkiv/char-ini.mkiv
diff --git a/tex/context/base/char-map.lua b/tex/context/base/mkiv/char-map.lua
index 749da5289..749da5289 100644
--- a/tex/context/base/char-map.lua
+++ b/tex/context/base/mkiv/char-map.lua
diff --git a/tex/context/base/char-tex.lua b/tex/context/base/mkiv/char-tex.lua
index df7433409..df7433409 100644
--- a/tex/context/base/char-tex.lua
+++ b/tex/context/base/mkiv/char-tex.lua
diff --git a/tex/context/base/char-utf.lua b/tex/context/base/mkiv/char-utf.lua
index 327529c32..327529c32 100644
--- a/tex/context/base/char-utf.lua
+++ b/tex/context/base/mkiv/char-utf.lua
diff --git a/tex/context/base/char-utf.mkiv b/tex/context/base/mkiv/char-utf.mkiv
index fe9f402ef..fe9f402ef 100644
--- a/tex/context/base/char-utf.mkiv
+++ b/tex/context/base/mkiv/char-utf.mkiv
diff --git a/tex/context/base/chem-ini.lua b/tex/context/base/mkiv/chem-ini.lua
index f7d10ffa2..f7d10ffa2 100644
--- a/tex/context/base/chem-ini.lua
+++ b/tex/context/base/mkiv/chem-ini.lua
diff --git a/tex/context/base/chem-ini.mkiv b/tex/context/base/mkiv/chem-ini.mkiv
index a5cd41f2b..a5cd41f2b 100644
--- a/tex/context/base/chem-ini.mkiv
+++ b/tex/context/base/mkiv/chem-ini.mkiv
diff --git a/tex/context/base/chem-str.lua b/tex/context/base/mkiv/chem-str.lua
index d724394bb..d724394bb 100644
--- a/tex/context/base/chem-str.lua
+++ b/tex/context/base/mkiv/chem-str.lua
diff --git a/tex/context/base/chem-str.mkiv b/tex/context/base/mkiv/chem-str.mkiv
index 5b8c6a069..5b8c6a069 100644
--- a/tex/context/base/chem-str.mkiv
+++ b/tex/context/base/mkiv/chem-str.mkiv
diff --git a/tex/context/base/cldf-bas.lua b/tex/context/base/mkiv/cldf-bas.lua
index 1067a17d5..1067a17d5 100644
--- a/tex/context/base/cldf-bas.lua
+++ b/tex/context/base/mkiv/cldf-bas.lua
diff --git a/tex/context/base/cldf-bas.mkiv b/tex/context/base/mkiv/cldf-bas.mkiv
index f8b5b5d6a..f8b5b5d6a 100644
--- a/tex/context/base/cldf-bas.mkiv
+++ b/tex/context/base/mkiv/cldf-bas.mkiv
diff --git a/tex/context/base/cldf-com.lua b/tex/context/base/mkiv/cldf-com.lua
index bd357b712..bd357b712 100644
--- a/tex/context/base/cldf-com.lua
+++ b/tex/context/base/mkiv/cldf-com.lua
diff --git a/tex/context/base/cldf-com.mkiv b/tex/context/base/mkiv/cldf-com.mkiv
index 491909888..491909888 100644
--- a/tex/context/base/cldf-com.mkiv
+++ b/tex/context/base/mkiv/cldf-com.mkiv
diff --git a/tex/context/base/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua
index e3ec5268a..0253adde5 100644
--- a/tex/context/base/cldf-ini.lua
+++ b/tex/context/base/mkiv/cldf-ini.lua
@@ -1721,6 +1721,12 @@ function context.concat(...)
     context(concat(...))
 end
 
+local p_texescape = patterns.texescape
+
+function context.escaped(s)
+    return lpegmatch(p_texescape,s) or s
+end
+
 -- templates
 
 local single  = lpegP("%")
diff --git a/tex/context/base/cldf-ini.mkiv b/tex/context/base/mkiv/cldf-ini.mkiv
index 12ada1383..12ada1383 100644
--- a/tex/context/base/cldf-ini.mkiv
+++ b/tex/context/base/mkiv/cldf-ini.mkiv
diff --git a/tex/context/base/cldf-int.lua b/tex/context/base/mkiv/cldf-int.lua
index 2743e4924..2743e4924 100644
--- a/tex/context/base/cldf-int.lua
+++ b/tex/context/base/mkiv/cldf-int.lua
diff --git a/tex/context/base/cldf-int.mkiv b/tex/context/base/mkiv/cldf-int.mkiv
index da684694a..da684694a 100644
--- a/tex/context/base/cldf-int.mkiv
+++ b/tex/context/base/mkiv/cldf-int.mkiv
diff --git a/tex/context/base/cldf-prs.lua b/tex/context/base/mkiv/cldf-prs.lua
index 3c3836a3e..3c3836a3e 100644
--- a/tex/context/base/cldf-prs.lua
+++ b/tex/context/base/mkiv/cldf-prs.lua
diff --git a/tex/context/base/cldf-scn.lua b/tex/context/base/mkiv/cldf-scn.lua
index 5f7e0c74b..5f7e0c74b 100644
--- a/tex/context/base/cldf-scn.lua
+++ b/tex/context/base/mkiv/cldf-scn.lua
diff --git a/tex/context/base/cldf-ver.lua b/tex/context/base/mkiv/cldf-ver.lua
index 66432eb1c..66432eb1c 100644
--- a/tex/context/base/cldf-ver.lua
+++ b/tex/context/base/mkiv/cldf-ver.lua
diff --git a/tex/context/base/cldf-ver.mkiv b/tex/context/base/mkiv/cldf-ver.mkiv
index 8e009035d..8e009035d 100644
--- a/tex/context/base/cldf-ver.mkiv
+++ b/tex/context/base/mkiv/cldf-ver.mkiv
diff --git a/tex/context/base/colo-ext.mkiv b/tex/context/base/mkiv/colo-ext.mkiv
index 74ce2d3e5..74ce2d3e5 100644
--- a/tex/context/base/colo-ext.mkiv
+++ b/tex/context/base/mkiv/colo-ext.mkiv
diff --git a/tex/context/base/colo-grp.mkiv b/tex/context/base/mkiv/colo-grp.mkiv
index e296bbc33..e296bbc33 100644
--- a/tex/context/base/colo-grp.mkiv
+++ b/tex/context/base/mkiv/colo-grp.mkiv
diff --git a/tex/context/base/colo-icc.lua b/tex/context/base/mkiv/colo-icc.lua
index f7ed561c1..f7ed561c1 100644
--- a/tex/context/base/colo-icc.lua
+++ b/tex/context/base/mkiv/colo-icc.lua
diff --git a/tex/context/base/colo-imp-dem.mkiv b/tex/context/base/mkiv/colo-imp-dem.mkiv
index 5b794c551..5b794c551 100644
--- a/tex/context/base/colo-imp-dem.mkiv
+++ b/tex/context/base/mkiv/colo-imp-dem.mkiv
diff --git a/tex/context/base/colo-imp-ema.mkiv b/tex/context/base/mkiv/colo-imp-ema.mkiv
index 11d76f342..11d76f342 100644
--- a/tex/context/base/colo-imp-ema.mkiv
+++ b/tex/context/base/mkiv/colo-imp-ema.mkiv
diff --git a/tex/context/base/colo-imp-rgb.mkiv b/tex/context/base/mkiv/colo-imp-rgb.mkiv
index d7b691fcc..d7b691fcc 100644
--- a/tex/context/base/colo-imp-rgb.mkiv
+++ b/tex/context/base/mkiv/colo-imp-rgb.mkiv
diff --git a/tex/context/base/colo-imp-x11.mkiv b/tex/context/base/mkiv/colo-imp-x11.mkiv
index 45d3aac62..45d3aac62 100644
--- a/tex/context/base/colo-imp-x11.mkiv
+++ b/tex/context/base/mkiv/colo-imp-x11.mkiv
diff --git a/tex/context/base/colo-imp-xwi.mkiv b/tex/context/base/mkiv/colo-imp-xwi.mkiv
index 557e9c57c..557e9c57c 100644
--- a/tex/context/base/colo-imp-xwi.mkiv
+++ b/tex/context/base/mkiv/colo-imp-xwi.mkiv
diff --git a/tex/context/base/colo-ini.lua b/tex/context/base/mkiv/colo-ini.lua
index 81adfa680..81adfa680 100644
--- a/tex/context/base/colo-ini.lua
+++ b/tex/context/base/mkiv/colo-ini.lua
diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/mkiv/colo-ini.mkiv
index 0f8d9b662..0f8d9b662 100644
--- a/tex/context/base/colo-ini.mkiv
+++ b/tex/context/base/mkiv/colo-ini.mkiv
diff --git a/tex/context/base/colo-run.lua b/tex/context/base/mkiv/colo-run.lua
index 27f7c6b12..27f7c6b12 100644
--- a/tex/context/base/colo-run.lua
+++ b/tex/context/base/mkiv/colo-run.lua
diff --git a/tex/context/base/colo-run.mkiv b/tex/context/base/mkiv/colo-run.mkiv
index 16f54c3b5..16f54c3b5 100644
--- a/tex/context/base/colo-run.mkiv
+++ b/tex/context/base/mkiv/colo-run.mkiv
diff --git a/tex/context/base/cont-cs.mkiv b/tex/context/base/mkiv/cont-cs.mkiv
index 75e30fe69..75e30fe69 100644
--- a/tex/context/base/cont-cs.mkiv
+++ b/tex/context/base/mkiv/cont-cs.mkiv
diff --git a/tex/context/base/cont-de.mkiv b/tex/context/base/mkiv/cont-de.mkiv
index 998f76466..998f76466 100644
--- a/tex/context/base/cont-de.mkiv
+++ b/tex/context/base/mkiv/cont-de.mkiv
diff --git a/tex/context/base/cont-en.mkiv b/tex/context/base/mkiv/cont-en.mkiv
index f25ab69cb..f25ab69cb 100644
--- a/tex/context/base/cont-en.mkiv
+++ b/tex/context/base/mkiv/cont-en.mkiv
diff --git a/tex/context/base/cont-fil.mkiv b/tex/context/base/mkiv/cont-fil.mkiv
index a1159b7f5..a1159b7f5 100644
--- a/tex/context/base/cont-fil.mkiv
+++ b/tex/context/base/mkiv/cont-fil.mkiv
diff --git a/tex/context/base/cont-fr.mkiv b/tex/context/base/mkiv/cont-fr.mkiv
index f45ec88c3..f45ec88c3 100644
--- a/tex/context/base/cont-fr.mkiv
+++ b/tex/context/base/mkiv/cont-fr.mkiv
diff --git a/tex/context/base/cont-gb.mkiv b/tex/context/base/mkiv/cont-gb.mkiv
index f6dd4ba9e..f6dd4ba9e 100644
--- a/tex/context/base/cont-gb.mkiv
+++ b/tex/context/base/mkiv/cont-gb.mkiv
diff --git a/tex/context/base/cont-it.mkiv b/tex/context/base/mkiv/cont-it.mkiv
index 483eb8589..483eb8589 100644
--- a/tex/context/base/cont-it.mkiv
+++ b/tex/context/base/mkiv/cont-it.mkiv
diff --git a/tex/context/base/cont-log.mkiv b/tex/context/base/mkiv/cont-log.mkiv
index 598140d32..598140d32 100644
--- a/tex/context/base/cont-log.mkiv
+++ b/tex/context/base/mkiv/cont-log.mkiv
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 731f2738b..7c8effba7 100644
--- a/tex/context/base/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.01.08 19:09}
+\newcontextversion{2016.01.12 16:24}
 
 %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/cont-nl.mkiv b/tex/context/base/mkiv/cont-nl.mkiv
index 890ad8ca5..890ad8ca5 100644
--- a/tex/context/base/cont-nl.mkiv
+++ b/tex/context/base/mkiv/cont-nl.mkiv
diff --git a/tex/context/base/cont-nop.mkiv b/tex/context/base/mkiv/cont-nop.mkiv
index c8188503e..c8188503e 100644
--- a/tex/context/base/cont-nop.mkiv
+++ b/tex/context/base/mkiv/cont-nop.mkiv
diff --git a/tex/context/base/cont-pe.mkiv b/tex/context/base/mkiv/cont-pe.mkiv
index 4f7efe959..4f7efe959 100644
--- a/tex/context/base/cont-pe.mkiv
+++ b/tex/context/base/mkiv/cont-pe.mkiv
diff --git a/tex/context/base/cont-ro.mkiv b/tex/context/base/mkiv/cont-ro.mkiv
index ac6f159f5..ac6f159f5 100644
--- a/tex/context/base/cont-ro.mkiv
+++ b/tex/context/base/mkiv/cont-ro.mkiv
diff --git a/tex/context/base/cont-run.lua b/tex/context/base/mkiv/cont-run.lua
index 0420ed01c..0420ed01c 100644
--- a/tex/context/base/cont-run.lua
+++ b/tex/context/base/mkiv/cont-run.lua
diff --git a/tex/context/base/cont-run.mkiv b/tex/context/base/mkiv/cont-run.mkiv
index fcca7b581..fcca7b581 100644
--- a/tex/context/base/cont-run.mkiv
+++ b/tex/context/base/mkiv/cont-run.mkiv
diff --git a/tex/context/base/cont-yes.mkiv b/tex/context/base/mkiv/cont-yes.mkiv
index 0b7f3231b..0b7f3231b 100644
--- a/tex/context/base/cont-yes.mkiv
+++ b/tex/context/base/mkiv/cont-yes.mkiv
diff --git a/tex/context/base/context-base.lmx b/tex/context/base/mkiv/context-base.lmx
index 482d43e88..482d43e88 100644
--- a/tex/context/base/context-base.lmx
+++ b/tex/context/base/mkiv/context-base.lmx
diff --git a/tex/context/base/context-characters.lmx b/tex/context/base/mkiv/context-characters.lmx
index f018e412b..f018e412b 100644
--- a/tex/context/base/context-characters.lmx
+++ b/tex/context/base/mkiv/context-characters.lmx
diff --git a/tex/context/base/context-debug.lmx b/tex/context/base/mkiv/context-debug.lmx
index 51b18c837..51b18c837 100644
--- a/tex/context/base/context-debug.lmx
+++ b/tex/context/base/mkiv/context-debug.lmx
diff --git a/tex/context/base/context-error.lmx b/tex/context/base/mkiv/context-error.lmx
index b82b552f8..b82b552f8 100644
--- a/tex/context/base/context-error.lmx
+++ b/tex/context/base/mkiv/context-error.lmx
diff --git a/tex/context/base/context-fonttest.lmx b/tex/context/base/mkiv/context-fonttest.lmx
index fddb8196b..fddb8196b 100644
--- a/tex/context/base/context-fonttest.lmx
+++ b/tex/context/base/mkiv/context-fonttest.lmx
diff --git a/tex/context/base/context-help.lmx b/tex/context/base/mkiv/context-help.lmx
index cf4f73a61..cf4f73a61 100644
--- a/tex/context/base/context-help.lmx
+++ b/tex/context/base/mkiv/context-help.lmx
diff --git a/tex/context/base/context-performance.tex b/tex/context/base/mkiv/context-performance.tex
index c012c992c..c012c992c 100644
--- a/tex/context/base/context-performance.tex
+++ b/tex/context/base/mkiv/context-performance.tex
diff --git a/tex/context/base/context-timing.lmx b/tex/context/base/mkiv/context-timing.lmx
index 57b5879ba..57b5879ba 100644
--- a/tex/context/base/context-timing.lmx
+++ b/tex/context/base/mkiv/context-timing.lmx
diff --git a/tex/context/base/context.css b/tex/context/base/mkiv/context.css
index be1dad796..be1dad796 100644
--- a/tex/context/base/context.css
+++ b/tex/context/base/mkiv/context.css
diff --git a/tex/context/base/context.lus b/tex/context/base/mkiv/context.lus
index 960e96adf..960e96adf 100644
--- a/tex/context/base/context.lus
+++ b/tex/context/base/mkiv/context.lus
diff --git a/tex/context/base/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 6c439e66a..f4ab0ffe2 100644
--- a/tex/context/base/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.01.08 19:09}
+\edef\contextversion{2016.01.12 16:24}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-con.lua b/tex/context/base/mkiv/core-con.lua
index 58d7c9e02..58d7c9e02 100644
--- a/tex/context/base/core-con.lua
+++ b/tex/context/base/mkiv/core-con.lua
diff --git a/tex/context/base/core-con.mkiv b/tex/context/base/mkiv/core-con.mkiv
index 1ca38ae14..1ca38ae14 100644
--- a/tex/context/base/core-con.mkiv
+++ b/tex/context/base/mkiv/core-con.mkiv
diff --git a/tex/context/base/core-ctx.ctx b/tex/context/base/mkiv/core-ctx.ctx
index 5126ad2d2..5126ad2d2 100644
--- a/tex/context/base/core-ctx.ctx
+++ b/tex/context/base/mkiv/core-ctx.ctx
diff --git a/tex/context/base/core-ctx.lua b/tex/context/base/mkiv/core-ctx.lua
index c20691cd7..c20691cd7 100644
--- a/tex/context/base/core-ctx.lua
+++ b/tex/context/base/mkiv/core-ctx.lua
diff --git a/tex/context/base/core-ctx.mkiv b/tex/context/base/mkiv/core-ctx.mkiv
index e6372d099..e6372d099 100644
--- a/tex/context/base/core-ctx.mkiv
+++ b/tex/context/base/mkiv/core-ctx.mkiv
diff --git a/tex/context/base/core-dat.lua b/tex/context/base/mkiv/core-dat.lua
index c3b00a7c0..c3b00a7c0 100644
--- a/tex/context/base/core-dat.lua
+++ b/tex/context/base/mkiv/core-dat.lua
diff --git a/tex/context/base/core-dat.mkiv b/tex/context/base/mkiv/core-dat.mkiv
index 26b1f14b5..26b1f14b5 100644
--- a/tex/context/base/core-dat.mkiv
+++ b/tex/context/base/mkiv/core-dat.mkiv
diff --git a/tex/context/base/core-def.mkiv b/tex/context/base/mkiv/core-def.mkiv
index acd411fac..acd411fac 100644
--- a/tex/context/base/core-def.mkiv
+++ b/tex/context/base/mkiv/core-def.mkiv
diff --git a/tex/context/base/core-env.lua b/tex/context/base/mkiv/core-env.lua
index 866176171..866176171 100644
--- a/tex/context/base/core-env.lua
+++ b/tex/context/base/mkiv/core-env.lua
diff --git a/tex/context/base/core-env.mkiv b/tex/context/base/mkiv/core-env.mkiv
index 47ae35d2e..47ae35d2e 100644
--- a/tex/context/base/core-env.mkiv
+++ b/tex/context/base/mkiv/core-env.mkiv
diff --git a/tex/context/base/core-ini.mkiv b/tex/context/base/mkiv/core-ini.mkiv
index 0407409a3..0407409a3 100644
--- a/tex/context/base/core-ini.mkiv
+++ b/tex/context/base/mkiv/core-ini.mkiv
diff --git a/tex/context/base/core-sys.lua b/tex/context/base/mkiv/core-sys.lua
index f688a1454..f688a1454 100644
--- a/tex/context/base/core-sys.lua
+++ b/tex/context/base/mkiv/core-sys.lua
diff --git a/tex/context/base/core-sys.mkiv b/tex/context/base/mkiv/core-sys.mkiv
index cc9dafdd2..cc9dafdd2 100644
--- a/tex/context/base/core-sys.mkiv
+++ b/tex/context/base/mkiv/core-sys.mkiv
diff --git a/tex/context/base/core-two.lua b/tex/context/base/mkiv/core-two.lua
index bb1afa7db..bb1afa7db 100644
--- a/tex/context/base/core-two.lua
+++ b/tex/context/base/mkiv/core-two.lua
diff --git a/tex/context/base/core-two.mkiv b/tex/context/base/mkiv/core-two.mkiv
index 5a791dea2..5a791dea2 100644
--- a/tex/context/base/core-two.mkiv
+++ b/tex/context/base/mkiv/core-two.mkiv
diff --git a/tex/context/base/core-uti.lua b/tex/context/base/mkiv/core-uti.lua
index 23057872f..23057872f 100644
--- a/tex/context/base/core-uti.lua
+++ b/tex/context/base/mkiv/core-uti.lua
diff --git a/tex/context/base/core-uti.mkiv b/tex/context/base/mkiv/core-uti.mkiv
index de9a893ee..de9a893ee 100644
--- a/tex/context/base/core-uti.mkiv
+++ b/tex/context/base/mkiv/core-uti.mkiv
diff --git a/tex/context/base/data-aux.lua b/tex/context/base/mkiv/data-aux.lua
index dae96ce62..dae96ce62 100644
--- a/tex/context/base/data-aux.lua
+++ b/tex/context/base/mkiv/data-aux.lua
diff --git a/tex/context/base/data-bin.lua b/tex/context/base/mkiv/data-bin.lua
index 1d1e8b749..1d1e8b749 100644
--- a/tex/context/base/data-bin.lua
+++ b/tex/context/base/mkiv/data-bin.lua
diff --git a/tex/context/base/data-con.lua b/tex/context/base/mkiv/data-con.lua
index 240538df2..240538df2 100644
--- a/tex/context/base/data-con.lua
+++ b/tex/context/base/mkiv/data-con.lua
diff --git a/tex/context/base/data-crl.lua b/tex/context/base/mkiv/data-crl.lua
index fba5a6230..fba5a6230 100644
--- a/tex/context/base/data-crl.lua
+++ b/tex/context/base/mkiv/data-crl.lua
diff --git a/tex/context/base/data-ctx.lua b/tex/context/base/mkiv/data-ctx.lua
index 345e9c741..345e9c741 100644
--- a/tex/context/base/data-ctx.lua
+++ b/tex/context/base/mkiv/data-ctx.lua
diff --git a/tex/context/base/data-env.lua b/tex/context/base/mkiv/data-env.lua
index 1d7728c22..1d7728c22 100644
--- a/tex/context/base/data-env.lua
+++ b/tex/context/base/mkiv/data-env.lua
diff --git a/tex/context/base/data-exp.lua b/tex/context/base/mkiv/data-exp.lua
index 19ceb90c3..19ceb90c3 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/mkiv/data-exp.lua
diff --git a/tex/context/base/data-fil.lua b/tex/context/base/mkiv/data-fil.lua
index b699fc9e3..b699fc9e3 100644
--- a/tex/context/base/data-fil.lua
+++ b/tex/context/base/mkiv/data-fil.lua
diff --git a/tex/context/base/data-gen.lua b/tex/context/base/mkiv/data-gen.lua
index 5a0755831..5a0755831 100644
--- a/tex/context/base/data-gen.lua
+++ b/tex/context/base/mkiv/data-gen.lua
diff --git a/tex/context/base/data-ini.lua b/tex/context/base/mkiv/data-ini.lua
index c74ff2e04..c74ff2e04 100644
--- a/tex/context/base/data-ini.lua
+++ b/tex/context/base/mkiv/data-ini.lua
diff --git a/tex/context/base/data-inp.lua b/tex/context/base/mkiv/data-inp.lua
index 97fb8904b..97fb8904b 100644
--- a/tex/context/base/data-inp.lua
+++ b/tex/context/base/mkiv/data-inp.lua
diff --git a/tex/context/base/data-lst.lua b/tex/context/base/mkiv/data-lst.lua
index e4621a6e1..e4621a6e1 100644
--- a/tex/context/base/data-lst.lua
+++ b/tex/context/base/mkiv/data-lst.lua
diff --git a/tex/context/base/data-lua.lua b/tex/context/base/mkiv/data-lua.lua
index 7c12a5940..7c12a5940 100644
--- a/tex/context/base/data-lua.lua
+++ b/tex/context/base/mkiv/data-lua.lua
diff --git a/tex/context/base/data-met.lua b/tex/context/base/mkiv/data-met.lua
index 4e8a48f50..4e8a48f50 100644
--- a/tex/context/base/data-met.lua
+++ b/tex/context/base/mkiv/data-met.lua
diff --git a/tex/context/base/data-out.lua b/tex/context/base/mkiv/data-out.lua
index 11304c2ce..11304c2ce 100644
--- a/tex/context/base/data-out.lua
+++ b/tex/context/base/mkiv/data-out.lua
diff --git a/tex/context/base/data-pre.lua b/tex/context/base/mkiv/data-pre.lua
index 1c5016f86..1c5016f86 100644
--- a/tex/context/base/data-pre.lua
+++ b/tex/context/base/mkiv/data-pre.lua
diff --git a/tex/context/base/data-res.lua b/tex/context/base/mkiv/data-res.lua
index cbda21ce2..cbda21ce2 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/mkiv/data-res.lua
diff --git a/tex/context/base/data-sch.lua b/tex/context/base/mkiv/data-sch.lua
index d79e0c7ef..d79e0c7ef 100644
--- a/tex/context/base/data-sch.lua
+++ b/tex/context/base/mkiv/data-sch.lua
diff --git a/tex/context/base/data-tex.lua b/tex/context/base/mkiv/data-tex.lua
index b6b97a0a9..b6b97a0a9 100644
--- a/tex/context/base/data-tex.lua
+++ b/tex/context/base/mkiv/data-tex.lua
diff --git a/tex/context/base/data-tmf.lua b/tex/context/base/mkiv/data-tmf.lua
index e0ccac257..e0ccac257 100644
--- a/tex/context/base/data-tmf.lua
+++ b/tex/context/base/mkiv/data-tmf.lua
diff --git a/tex/context/base/data-tmp.lua b/tex/context/base/mkiv/data-tmp.lua
index 9e1515a26..9e1515a26 100644
--- a/tex/context/base/data-tmp.lua
+++ b/tex/context/base/mkiv/data-tmp.lua
diff --git a/tex/context/base/data-tre.lua b/tex/context/base/mkiv/data-tre.lua
index 4388731f9..4388731f9 100644
--- a/tex/context/base/data-tre.lua
+++ b/tex/context/base/mkiv/data-tre.lua
diff --git a/tex/context/base/data-use.lua b/tex/context/base/mkiv/data-use.lua
index 7598506e4..7598506e4 100644
--- a/tex/context/base/data-use.lua
+++ b/tex/context/base/mkiv/data-use.lua
diff --git a/tex/context/base/data-vir.lua b/tex/context/base/mkiv/data-vir.lua
index 7e25c822d..7e25c822d 100644
--- a/tex/context/base/data-vir.lua
+++ b/tex/context/base/mkiv/data-vir.lua
diff --git a/tex/context/base/data-zip.lua b/tex/context/base/mkiv/data-zip.lua
index 2be88e0fc..2be88e0fc 100644
--- a/tex/context/base/data-zip.lua
+++ b/tex/context/base/mkiv/data-zip.lua
diff --git a/tex/context/base/enco-ini.mkiv b/tex/context/base/mkiv/enco-ini.mkiv
index f15fd1616..f15fd1616 100644
--- a/tex/context/base/enco-ini.mkiv
+++ b/tex/context/base/mkiv/enco-ini.mkiv
diff --git a/tex/context/base/export-example.css b/tex/context/base/mkiv/export-example.css
index 8c7ae3bfc..8c7ae3bfc 100644
--- a/tex/context/base/export-example.css
+++ b/tex/context/base/mkiv/export-example.css
diff --git a/tex/context/base/export-example.rng b/tex/context/base/mkiv/export-example.rng
index 93b21ba50..93b21ba50 100644
--- a/tex/context/base/export-example.rng
+++ b/tex/context/base/mkiv/export-example.rng
diff --git a/tex/context/base/export-example.tex b/tex/context/base/mkiv/export-example.tex
index 32cb79c5e..32cb79c5e 100644
--- a/tex/context/base/export-example.tex
+++ b/tex/context/base/mkiv/export-example.tex
diff --git a/tex/context/base/file-ini.lua b/tex/context/base/mkiv/file-ini.lua
index 2a0271a9d..2a0271a9d 100644
--- a/tex/context/base/file-ini.lua
+++ b/tex/context/base/mkiv/file-ini.lua
diff --git a/tex/context/base/file-ini.mkvi b/tex/context/base/mkiv/file-ini.mkvi
index cb9f18cf9..cb9f18cf9 100644
--- a/tex/context/base/file-ini.mkvi
+++ b/tex/context/base/mkiv/file-ini.mkvi
diff --git a/tex/context/base/file-job.lua b/tex/context/base/mkiv/file-job.lua
index 19a02c477..19a02c477 100644
--- a/tex/context/base/file-job.lua
+++ b/tex/context/base/mkiv/file-job.lua
diff --git a/tex/context/base/file-job.mkvi b/tex/context/base/mkiv/file-job.mkvi
index 7814aba3f..7814aba3f 100644
--- a/tex/context/base/file-job.mkvi
+++ b/tex/context/base/mkiv/file-job.mkvi
diff --git a/tex/context/base/file-lib.lua b/tex/context/base/mkiv/file-lib.lua
index 361608ea3..361608ea3 100644
--- a/tex/context/base/file-lib.lua
+++ b/tex/context/base/mkiv/file-lib.lua
diff --git a/tex/context/base/file-lib.mkvi b/tex/context/base/mkiv/file-lib.mkvi
index 76137ce15..76137ce15 100644
--- a/tex/context/base/file-lib.mkvi
+++ b/tex/context/base/mkiv/file-lib.mkvi
diff --git a/tex/context/base/file-mod.lua b/tex/context/base/mkiv/file-mod.lua
index 7f3763c5d..7f3763c5d 100644
--- a/tex/context/base/file-mod.lua
+++ b/tex/context/base/mkiv/file-mod.lua
diff --git a/tex/context/base/file-mod.mkvi b/tex/context/base/mkiv/file-mod.mkvi
index ebd741d42..ebd741d42 100644
--- a/tex/context/base/file-mod.mkvi
+++ b/tex/context/base/mkiv/file-mod.mkvi
diff --git a/tex/context/base/file-res.lua b/tex/context/base/mkiv/file-res.lua
index 08a3e22af..08a3e22af 100644
--- a/tex/context/base/file-res.lua
+++ b/tex/context/base/mkiv/file-res.lua
diff --git a/tex/context/base/file-res.mkvi b/tex/context/base/mkiv/file-res.mkvi
index 17f4cf44c..17f4cf44c 100644
--- a/tex/context/base/file-res.mkvi
+++ b/tex/context/base/mkiv/file-res.mkvi
diff --git a/tex/context/base/file-syn.lua b/tex/context/base/mkiv/file-syn.lua
index b6ad27c83..b6ad27c83 100644
--- a/tex/context/base/file-syn.lua
+++ b/tex/context/base/mkiv/file-syn.lua
diff --git a/tex/context/base/file-syn.mkvi b/tex/context/base/mkiv/file-syn.mkvi
index 52ecd0d71..52ecd0d71 100644
--- a/tex/context/base/file-syn.mkvi
+++ b/tex/context/base/mkiv/file-syn.mkvi
diff --git a/tex/context/base/font-afk.lua b/tex/context/base/mkiv/font-afk.lua
index 8b65b0631..8b65b0631 100644
--- a/tex/context/base/font-afk.lua
+++ b/tex/context/base/mkiv/font-afk.lua
diff --git a/tex/context/base/font-afm.lua b/tex/context/base/mkiv/font-afm.lua
index 329639b85..329639b85 100644
--- a/tex/context/base/font-afm.lua
+++ b/tex/context/base/mkiv/font-afm.lua
diff --git a/tex/context/base/font-age.lua b/tex/context/base/mkiv/font-age.lua
index bb6883a74..bb6883a74 100644
--- a/tex/context/base/font-age.lua
+++ b/tex/context/base/mkiv/font-age.lua
diff --git a/tex/context/base/font-agl.lua b/tex/context/base/mkiv/font-agl.lua
index dd3490523..dd3490523 100644
--- a/tex/context/base/font-agl.lua
+++ b/tex/context/base/mkiv/font-agl.lua
diff --git a/tex/context/base/font-aux.lua b/tex/context/base/mkiv/font-aux.lua
index fc6c90bc1..fc6c90bc1 100644
--- a/tex/context/base/font-aux.lua
+++ b/tex/context/base/mkiv/font-aux.lua
diff --git a/tex/context/base/font-aux.mkvi b/tex/context/base/mkiv/font-aux.mkvi
index bd655e41c..bd655e41c 100644
--- a/tex/context/base/font-aux.mkvi
+++ b/tex/context/base/mkiv/font-aux.mkvi
diff --git a/tex/context/base/font-cff.lua b/tex/context/base/mkiv/font-cff.lua
index 0314e4ac4..0314e4ac4 100644
--- a/tex/context/base/font-cff.lua
+++ b/tex/context/base/mkiv/font-cff.lua
diff --git a/tex/context/base/font-chk.lua b/tex/context/base/mkiv/font-chk.lua
index 5b1ad9920..5b1ad9920 100644
--- a/tex/context/base/font-chk.lua
+++ b/tex/context/base/mkiv/font-chk.lua
diff --git a/tex/context/base/font-chk.mkiv b/tex/context/base/mkiv/font-chk.mkiv
index 4c8967532..4c8967532 100644
--- a/tex/context/base/font-chk.mkiv
+++ b/tex/context/base/mkiv/font-chk.mkiv
diff --git a/tex/context/base/font-cid.lua b/tex/context/base/mkiv/font-cid.lua
index 0eaacdfbd..0eaacdfbd 100644
--- a/tex/context/base/font-cid.lua
+++ b/tex/context/base/mkiv/font-cid.lua
diff --git a/tex/context/base/font-col.lua b/tex/context/base/mkiv/font-col.lua
index adcf374e2..adcf374e2 100644
--- a/tex/context/base/font-col.lua
+++ b/tex/context/base/mkiv/font-col.lua
diff --git a/tex/context/base/font-col.mkvi b/tex/context/base/mkiv/font-col.mkvi
index bc8e8151e..bc8e8151e 100644
--- a/tex/context/base/font-col.mkvi
+++ b/tex/context/base/mkiv/font-col.mkvi
diff --git a/tex/context/base/font-con.lua b/tex/context/base/mkiv/font-con.lua
index e5bf9e9c1..e5bf9e9c1 100644
--- a/tex/context/base/font-con.lua
+++ b/tex/context/base/mkiv/font-con.lua
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index a99d2ed91..a99d2ed91 100644
--- a/tex/context/base/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
diff --git a/tex/context/base/font-def.lua b/tex/context/base/mkiv/font-def.lua
index add42ee38..add42ee38 100644
--- a/tex/context/base/font-def.lua
+++ b/tex/context/base/mkiv/font-def.lua
diff --git a/tex/context/base/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index 77ddea12b..77ddea12b 100644
--- a/tex/context/base/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
diff --git a/tex/context/base/font-emp.mkvi b/tex/context/base/mkiv/font-emp.mkvi
index 8f87ff7a1..8f87ff7a1 100644
--- a/tex/context/base/font-emp.mkvi
+++ b/tex/context/base/mkiv/font-emp.mkvi
diff --git a/tex/context/base/font-enc.lua b/tex/context/base/mkiv/font-enc.lua
index 2e8b722de..2e8b722de 100644
--- a/tex/context/base/font-enc.lua
+++ b/tex/context/base/mkiv/font-enc.lua
diff --git a/tex/context/base/font-enh.lua b/tex/context/base/mkiv/font-enh.lua
index 3439a434a..3439a434a 100644
--- a/tex/context/base/font-enh.lua
+++ b/tex/context/base/mkiv/font-enh.lua
diff --git a/tex/context/base/font-ext.lua b/tex/context/base/mkiv/font-ext.lua
index f153d5624..f153d5624 100644
--- a/tex/context/base/font-ext.lua
+++ b/tex/context/base/mkiv/font-ext.lua
diff --git a/tex/context/base/font-fbk.lua b/tex/context/base/mkiv/font-fbk.lua
index 56f002558..56f002558 100644
--- a/tex/context/base/font-fbk.lua
+++ b/tex/context/base/mkiv/font-fbk.lua
diff --git a/tex/context/base/font-fea.mkvi b/tex/context/base/mkiv/font-fea.mkvi
index dade70494..dade70494 100644
--- a/tex/context/base/font-fea.mkvi
+++ b/tex/context/base/mkiv/font-fea.mkvi
diff --git a/tex/context/base/font-fil.mkvi b/tex/context/base/mkiv/font-fil.mkvi
index 0bfc07b6c..0bfc07b6c 100644
--- a/tex/context/base/font-fil.mkvi
+++ b/tex/context/base/mkiv/font-fil.mkvi
diff --git a/tex/context/base/font-gds.lua b/tex/context/base/mkiv/font-gds.lua
index 23bbad42f..23bbad42f 100644
--- a/tex/context/base/font-gds.lua
+++ b/tex/context/base/mkiv/font-gds.lua
diff --git a/tex/context/base/font-gds.mkvi b/tex/context/base/mkiv/font-gds.mkvi
index e9c34e807..e9c34e807 100644
--- a/tex/context/base/font-gds.mkvi
+++ b/tex/context/base/mkiv/font-gds.mkvi
diff --git a/tex/context/base/font-hsh.lua b/tex/context/base/mkiv/font-hsh.lua
index efd042fe1..efd042fe1 100644
--- a/tex/context/base/font-hsh.lua
+++ b/tex/context/base/mkiv/font-hsh.lua
diff --git a/tex/context/base/font-ini.lua b/tex/context/base/mkiv/font-ini.lua
index c547f89ac..c547f89ac 100644
--- a/tex/context/base/font-ini.lua
+++ b/tex/context/base/mkiv/font-ini.lua
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/mkiv/font-ini.mkvi
index ee146c1a5..ee146c1a5 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/mkiv/font-ini.mkvi
diff --git a/tex/context/base/font-inj.lua b/tex/context/base/mkiv/font-inj.lua
index 89370210d..89370210d 100644
--- a/tex/context/base/font-inj.lua
+++ b/tex/context/base/mkiv/font-inj.lua
diff --git a/tex/context/base/font-ldr.lua b/tex/context/base/mkiv/font-ldr.lua
index 175b4d0cc..175b4d0cc 100644
--- a/tex/context/base/font-ldr.lua
+++ b/tex/context/base/mkiv/font-ldr.lua
diff --git a/tex/context/base/font-lib.mkvi b/tex/context/base/mkiv/font-lib.mkvi
index 848fa872f..848fa872f 100644
--- a/tex/context/base/font-lib.mkvi
+++ b/tex/context/base/mkiv/font-lib.mkvi
diff --git a/tex/context/base/font-log.lua b/tex/context/base/mkiv/font-log.lua
index 092b5a62e..092b5a62e 100644
--- a/tex/context/base/font-log.lua
+++ b/tex/context/base/mkiv/font-log.lua
diff --git a/tex/context/base/font-lua.lua b/tex/context/base/mkiv/font-lua.lua
index 6fbbcf17e..6fbbcf17e 100644
--- a/tex/context/base/font-lua.lua
+++ b/tex/context/base/mkiv/font-lua.lua
diff --git a/tex/context/base/font-map.lua b/tex/context/base/mkiv/font-map.lua
index dc3f499ab..dc3f499ab 100644
--- a/tex/context/base/font-map.lua
+++ b/tex/context/base/mkiv/font-map.lua
diff --git a/tex/context/base/font-mat.mkvi b/tex/context/base/mkiv/font-mat.mkvi
index 2e7c2080d..2e7c2080d 100644
--- a/tex/context/base/font-mat.mkvi
+++ b/tex/context/base/mkiv/font-mat.mkvi
diff --git a/tex/context/base/font-mis.lua b/tex/context/base/mkiv/font-mis.lua
index d3d733723..d3d733723 100644
--- a/tex/context/base/font-mis.lua
+++ b/tex/context/base/mkiv/font-mis.lua
diff --git a/tex/context/base/font-mps.lua b/tex/context/base/mkiv/font-mps.lua
index 7529f2c5f..7529f2c5f 100644
--- a/tex/context/base/font-mps.lua
+++ b/tex/context/base/mkiv/font-mps.lua
diff --git a/tex/context/base/font-nod.lua b/tex/context/base/mkiv/font-nod.lua
index e0e0ca377..e0e0ca377 100644
--- a/tex/context/base/font-nod.lua
+++ b/tex/context/base/mkiv/font-nod.lua
diff --git a/tex/context/base/font-odk.lua b/tex/context/base/mkiv/font-odk.lua
index c34efc120..c34efc120 100644
--- a/tex/context/base/font-odk.lua
+++ b/tex/context/base/mkiv/font-odk.lua
diff --git a/tex/context/base/font-odv.lua b/tex/context/base/mkiv/font-odv.lua
index 6b9a5a9e4..6b9a5a9e4 100644
--- a/tex/context/base/font-odv.lua
+++ b/tex/context/base/mkiv/font-odv.lua
diff --git a/tex/context/base/font-off.lua b/tex/context/base/mkiv/font-off.lua
index 5fe68dc2a..5fe68dc2a 100644
--- a/tex/context/base/font-off.lua
+++ b/tex/context/base/mkiv/font-off.lua
diff --git a/tex/context/base/font-osd.lua b/tex/context/base/mkiv/font-osd.lua
index 23579ea48..23579ea48 100644
--- a/tex/context/base/font-osd.lua
+++ b/tex/context/base/mkiv/font-osd.lua
diff --git a/tex/context/base/font-ota.lua b/tex/context/base/mkiv/font-ota.lua
index 08f69f92a..08f69f92a 100644
--- a/tex/context/base/font-ota.lua
+++ b/tex/context/base/mkiv/font-ota.lua
diff --git a/tex/context/base/font-otb.lua b/tex/context/base/mkiv/font-otb.lua
index c9f5d4aca..c9f5d4aca 100644
--- a/tex/context/base/font-otb.lua
+++ b/tex/context/base/mkiv/font-otb.lua
diff --git a/tex/context/base/font-otc.lua b/tex/context/base/mkiv/font-otc.lua
index 0cc7b58b0..0cc7b58b0 100644
--- a/tex/context/base/font-otc.lua
+++ b/tex/context/base/mkiv/font-otc.lua
diff --git a/tex/context/base/font-otd.lua b/tex/context/base/mkiv/font-otd.lua
index db041c722..db041c722 100644
--- a/tex/context/base/font-otd.lua
+++ b/tex/context/base/mkiv/font-otd.lua
diff --git a/tex/context/base/font-otf.lua b/tex/context/base/mkiv/font-otf.lua
index e90ec738f..e90ec738f 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/mkiv/font-otf.lua
diff --git a/tex/context/base/font-oth.lua b/tex/context/base/mkiv/font-oth.lua
index 28c543494..28c543494 100644
--- a/tex/context/base/font-oth.lua
+++ b/tex/context/base/mkiv/font-oth.lua
diff --git a/tex/context/base/font-oti.lua b/tex/context/base/mkiv/font-oti.lua
index bacd001a5..bacd001a5 100644
--- a/tex/context/base/font-oti.lua
+++ b/tex/context/base/mkiv/font-oti.lua
diff --git a/tex/context/base/font-otj.lua b/tex/context/base/mkiv/font-otj.lua
index db30ff9cd..db30ff9cd 100644
--- a/tex/context/base/font-otj.lua
+++ b/tex/context/base/mkiv/font-otj.lua
diff --git a/tex/context/base/font-otl.lua b/tex/context/base/mkiv/font-otl.lua
index cc6befa9d..cc6befa9d 100644
--- a/tex/context/base/font-otl.lua
+++ b/tex/context/base/mkiv/font-otl.lua
diff --git a/tex/context/base/font-otn.lua b/tex/context/base/mkiv/font-otn.lua
index 8df01bdbf..8df01bdbf 100644
--- a/tex/context/base/font-otn.lua
+++ b/tex/context/base/mkiv/font-otn.lua
diff --git a/tex/context/base/font-oto.lua b/tex/context/base/mkiv/font-oto.lua
index b7ee717c9..b7ee717c9 100644
--- a/tex/context/base/font-oto.lua
+++ b/tex/context/base/mkiv/font-oto.lua
diff --git a/tex/context/base/font-otp.lua b/tex/context/base/mkiv/font-otp.lua
index 91bd05b32..91bd05b32 100644
--- a/tex/context/base/font-otp.lua
+++ b/tex/context/base/mkiv/font-otp.lua
diff --git a/tex/context/base/font-otr.lua b/tex/context/base/mkiv/font-otr.lua
index 7e5cf56f1..7e5cf56f1 100644
--- a/tex/context/base/font-otr.lua
+++ b/tex/context/base/mkiv/font-otr.lua
diff --git a/tex/context/base/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index 207d14650..207d14650 100644
--- a/tex/context/base/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
diff --git a/tex/context/base/font-ott.lua b/tex/context/base/mkiv/font-ott.lua
index 80aea5d9a..f8d74a317 100644
--- a/tex/context/base/font-ott.lua
+++ b/tex/context/base/mkiv/font-ott.lua
@@ -884,7 +884,7 @@ local baselines = allocate {
     ['icft'] = 'ideographic character face tope edige baseline',
     ['ideo'] = 'ideographic em-box bottom edge baseline',
     ['idtp'] = 'ideographic em-box top edge baseline',
-    ['math'] = 'mathmatical centered baseline',
+    ['math'] = 'mathematical centered baseline',
     ['romn'] = 'roman baseline'
 }
 
diff --git a/tex/context/base/font-oup.lua b/tex/context/base/mkiv/font-oup.lua
index 004e487c5..004e487c5 100644
--- a/tex/context/base/font-oup.lua
+++ b/tex/context/base/mkiv/font-oup.lua
diff --git a/tex/context/base/font-pat.lua b/tex/context/base/mkiv/font-pat.lua
index 357b12ea0..357b12ea0 100644
--- a/tex/context/base/font-pat.lua
+++ b/tex/context/base/mkiv/font-pat.lua
diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/mkiv/font-pre.mkiv
index 17adc5290..17adc5290 100644
--- a/tex/context/base/font-pre.mkiv
+++ b/tex/context/base/mkiv/font-pre.mkiv
diff --git a/tex/context/base/font-run.mkiv b/tex/context/base/mkiv/font-run.mkiv
index 1b8843b94..1b8843b94 100644
--- a/tex/context/base/font-run.mkiv
+++ b/tex/context/base/mkiv/font-run.mkiv
diff --git a/tex/context/base/font-sel.lua b/tex/context/base/mkiv/font-sel.lua
index c3431a213..c3431a213 100644
--- a/tex/context/base/font-sel.lua
+++ b/tex/context/base/mkiv/font-sel.lua
diff --git a/tex/context/base/font-sel.mkvi b/tex/context/base/mkiv/font-sel.mkvi
index eb45ea033..eb45ea033 100644
--- a/tex/context/base/font-sel.mkvi
+++ b/tex/context/base/mkiv/font-sel.mkvi
diff --git a/tex/context/base/font-set.mkvi b/tex/context/base/mkiv/font-set.mkvi
index b29545ace..b29545ace 100644
--- a/tex/context/base/font-set.mkvi
+++ b/tex/context/base/mkiv/font-set.mkvi
diff --git a/tex/context/base/font-sol.lua b/tex/context/base/mkiv/font-sol.lua
index eca51cd61..eca51cd61 100644
--- a/tex/context/base/font-sol.lua
+++ b/tex/context/base/mkiv/font-sol.lua
diff --git a/tex/context/base/font-sol.mkvi b/tex/context/base/mkiv/font-sol.mkvi
index d065b78ea..d065b78ea 100644
--- a/tex/context/base/font-sol.mkvi
+++ b/tex/context/base/mkiv/font-sol.mkvi
diff --git a/tex/context/base/font-sty.mkvi b/tex/context/base/mkiv/font-sty.mkvi
index 48b81b55a..48b81b55a 100644
--- a/tex/context/base/font-sty.mkvi
+++ b/tex/context/base/mkiv/font-sty.mkvi
diff --git a/tex/context/base/font-sym.mkvi b/tex/context/base/mkiv/font-sym.mkvi
index c1ffd6361..c1ffd6361 100644
--- a/tex/context/base/font-sym.mkvi
+++ b/tex/context/base/mkiv/font-sym.mkvi
diff --git a/tex/context/base/font-syn.lua b/tex/context/base/mkiv/font-syn.lua
index 5e2d3a1ef..5e2d3a1ef 100644
--- a/tex/context/base/font-syn.lua
+++ b/tex/context/base/mkiv/font-syn.lua
diff --git a/tex/context/base/font-tfm.lua b/tex/context/base/mkiv/font-tfm.lua
index 2dd576849..2dd576849 100644
--- a/tex/context/base/font-tfm.lua
+++ b/tex/context/base/mkiv/font-tfm.lua
diff --git a/tex/context/base/font-tmp.lua b/tex/context/base/mkiv/font-tmp.lua
index 8db5cff14..8db5cff14 100644
--- a/tex/context/base/font-tmp.lua
+++ b/tex/context/base/mkiv/font-tmp.lua
diff --git a/tex/context/base/font-tra.mkiv b/tex/context/base/mkiv/font-tra.mkiv
index f5290d614..f5290d614 100644
--- a/tex/context/base/font-tra.mkiv
+++ b/tex/context/base/mkiv/font-tra.mkiv
diff --git a/tex/context/base/font-trt.lua b/tex/context/base/mkiv/font-trt.lua
index abc92ba52..abc92ba52 100644
--- a/tex/context/base/font-trt.lua
+++ b/tex/context/base/mkiv/font-trt.lua
diff --git a/tex/context/base/font-ttf.lua b/tex/context/base/mkiv/font-ttf.lua
index 6df339214..6df339214 100644
--- a/tex/context/base/font-ttf.lua
+++ b/tex/context/base/mkiv/font-ttf.lua
diff --git a/tex/context/base/font-uni.mkiv b/tex/context/base/mkiv/font-uni.mkiv
index 91a488ff2..91a488ff2 100644
--- a/tex/context/base/font-uni.mkiv
+++ b/tex/context/base/mkiv/font-uni.mkiv
diff --git a/tex/context/base/font-unk.mkiv b/tex/context/base/mkiv/font-unk.mkiv
index 988e5df3d..988e5df3d 100644
--- a/tex/context/base/font-unk.mkiv
+++ b/tex/context/base/mkiv/font-unk.mkiv
diff --git a/tex/context/base/font-var.mkvi b/tex/context/base/mkiv/font-var.mkvi
index fb60b711c..fb60b711c 100644
--- a/tex/context/base/font-var.mkvi
+++ b/tex/context/base/mkiv/font-var.mkvi
diff --git a/tex/context/base/font-vf.lua b/tex/context/base/mkiv/font-vf.lua
index fd3be3935..fd3be3935 100644
--- a/tex/context/base/font-vf.lua
+++ b/tex/context/base/mkiv/font-vf.lua
diff --git a/tex/context/base/grph-epd.lua b/tex/context/base/mkiv/grph-epd.lua
index 17f04d593..17f04d593 100644
--- a/tex/context/base/grph-epd.lua
+++ b/tex/context/base/mkiv/grph-epd.lua
diff --git a/tex/context/base/grph-epd.mkiv b/tex/context/base/mkiv/grph-epd.mkiv
index 8152772aa..8152772aa 100644
--- a/tex/context/base/grph-epd.mkiv
+++ b/tex/context/base/mkiv/grph-epd.mkiv
diff --git a/tex/context/base/grph-fig.mkiv b/tex/context/base/mkiv/grph-fig.mkiv
index 796309b88..796309b88 100644
--- a/tex/context/base/grph-fig.mkiv
+++ b/tex/context/base/mkiv/grph-fig.mkiv
diff --git a/tex/context/base/grph-fil.lua b/tex/context/base/mkiv/grph-fil.lua
index 5b091b265..5b091b265 100644
--- a/tex/context/base/grph-fil.lua
+++ b/tex/context/base/mkiv/grph-fil.lua
diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua
index 03557e370..03557e370 100644
--- a/tex/context/base/grph-inc.lua
+++ b/tex/context/base/mkiv/grph-inc.lua
diff --git a/tex/context/base/grph-inc.mkiv b/tex/context/base/mkiv/grph-inc.mkiv
index 47274a64e..47274a64e 100644
--- a/tex/context/base/grph-inc.mkiv
+++ b/tex/context/base/mkiv/grph-inc.mkiv
diff --git a/tex/context/base/grph-raw.lua b/tex/context/base/mkiv/grph-raw.lua
index 62e96fcc9..62e96fcc9 100644
--- a/tex/context/base/grph-raw.lua
+++ b/tex/context/base/mkiv/grph-raw.lua
diff --git a/tex/context/base/grph-raw.mkiv b/tex/context/base/mkiv/grph-raw.mkiv
index 8978ba267..8978ba267 100644
--- a/tex/context/base/grph-raw.mkiv
+++ b/tex/context/base/mkiv/grph-raw.mkiv
diff --git a/tex/context/base/grph-swf.lua b/tex/context/base/mkiv/grph-swf.lua
index 8c28b76af..8c28b76af 100644
--- a/tex/context/base/grph-swf.lua
+++ b/tex/context/base/mkiv/grph-swf.lua
diff --git a/tex/context/base/grph-trf.mkiv b/tex/context/base/mkiv/grph-trf.mkiv
index 099efa114..099efa114 100644
--- a/tex/context/base/grph-trf.mkiv
+++ b/tex/context/base/mkiv/grph-trf.mkiv
diff --git a/tex/context/base/grph-u3d.lua b/tex/context/base/mkiv/grph-u3d.lua
index 6961c5503..6961c5503 100644
--- a/tex/context/base/grph-u3d.lua
+++ b/tex/context/base/mkiv/grph-u3d.lua
diff --git a/tex/context/base/grph-wnd.lua b/tex/context/base/mkiv/grph-wnd.lua
index ebb9b1169..ebb9b1169 100644
--- a/tex/context/base/grph-wnd.lua
+++ b/tex/context/base/mkiv/grph-wnd.lua
diff --git a/tex/context/base/hand-ini.mkiv b/tex/context/base/mkiv/hand-ini.mkiv
index d4bffdb14..d4bffdb14 100644
--- a/tex/context/base/hand-ini.mkiv
+++ b/tex/context/base/mkiv/hand-ini.mkiv
diff --git a/tex/context/base/java-imp-exa.mkiv b/tex/context/base/mkiv/java-imp-exa.mkiv
index 584ee1351..584ee1351 100644
--- a/tex/context/base/java-imp-exa.mkiv
+++ b/tex/context/base/mkiv/java-imp-exa.mkiv
diff --git a/tex/context/base/java-imp-fil.mkiv b/tex/context/base/mkiv/java-imp-fil.mkiv
index 808950f28..808950f28 100644
--- a/tex/context/base/java-imp-fil.mkiv
+++ b/tex/context/base/mkiv/java-imp-fil.mkiv
diff --git a/tex/context/base/java-imp-fld.mkiv b/tex/context/base/mkiv/java-imp-fld.mkiv
index cbd53fffb..cbd53fffb 100644
--- a/tex/context/base/java-imp-fld.mkiv
+++ b/tex/context/base/mkiv/java-imp-fld.mkiv
diff --git a/tex/context/base/java-imp-rhh.mkiv b/tex/context/base/mkiv/java-imp-rhh.mkiv
index 5f057f550..5f057f550 100644
--- a/tex/context/base/java-imp-rhh.mkiv
+++ b/tex/context/base/mkiv/java-imp-rhh.mkiv
diff --git a/tex/context/base/java-imp-stp.mkiv b/tex/context/base/mkiv/java-imp-stp.mkiv
index 8ac5d58b8..8ac5d58b8 100644
--- a/tex/context/base/java-imp-stp.mkiv
+++ b/tex/context/base/mkiv/java-imp-stp.mkiv
diff --git a/tex/context/base/java-ini.lua b/tex/context/base/mkiv/java-ini.lua
index 069eb5ab6..069eb5ab6 100644
--- a/tex/context/base/java-ini.lua
+++ b/tex/context/base/mkiv/java-ini.lua
diff --git a/tex/context/base/java-ini.mkiv b/tex/context/base/mkiv/java-ini.mkiv
index d6fe4dd8a..d6fe4dd8a 100644
--- a/tex/context/base/java-ini.mkiv
+++ b/tex/context/base/mkiv/java-ini.mkiv
diff --git a/tex/context/base/l-boolean.lua b/tex/context/base/mkiv/l-boolean.lua
index 8f18d4c00..8f18d4c00 100644
--- a/tex/context/base/l-boolean.lua
+++ b/tex/context/base/mkiv/l-boolean.lua
diff --git a/tex/context/base/l-dir.lua b/tex/context/base/mkiv/l-dir.lua
index 81ac65e50..81ac65e50 100644
--- a/tex/context/base/l-dir.lua
+++ b/tex/context/base/mkiv/l-dir.lua
diff --git a/tex/context/base/l-file.lua b/tex/context/base/mkiv/l-file.lua
index 7ed6370f2..7ed6370f2 100644
--- a/tex/context/base/l-file.lua
+++ b/tex/context/base/mkiv/l-file.lua
diff --git a/tex/context/base/l-function.lua b/tex/context/base/mkiv/l-function.lua
index 7ded8ceec..7ded8ceec 100644
--- a/tex/context/base/l-function.lua
+++ b/tex/context/base/mkiv/l-function.lua
diff --git a/tex/context/base/l-gzip.lua b/tex/context/base/mkiv/l-gzip.lua
index 5100e4722..5100e4722 100644
--- a/tex/context/base/l-gzip.lua
+++ b/tex/context/base/mkiv/l-gzip.lua
diff --git a/tex/context/base/l-io.lua b/tex/context/base/mkiv/l-io.lua
index a91d44d87..a91d44d87 100644
--- a/tex/context/base/l-io.lua
+++ b/tex/context/base/mkiv/l-io.lua
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/mkiv/l-lpeg.lua
index 959ca553e..959ca553e 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/mkiv/l-lpeg.lua
diff --git a/tex/context/base/l-lua.lua b/tex/context/base/mkiv/l-lua.lua
index cb6182907..cb6182907 100644
--- a/tex/context/base/l-lua.lua
+++ b/tex/context/base/mkiv/l-lua.lua
diff --git a/tex/context/base/l-math.lua b/tex/context/base/mkiv/l-math.lua
index ec62919b4..ec62919b4 100644
--- a/tex/context/base/l-math.lua
+++ b/tex/context/base/mkiv/l-math.lua
diff --git a/tex/context/base/l-md5.lua b/tex/context/base/mkiv/l-md5.lua
index 00272c873..00272c873 100644
--- a/tex/context/base/l-md5.lua
+++ b/tex/context/base/mkiv/l-md5.lua
diff --git a/tex/context/base/l-number.lua b/tex/context/base/mkiv/l-number.lua
index 001ca31f7..001ca31f7 100644
--- a/tex/context/base/l-number.lua
+++ b/tex/context/base/mkiv/l-number.lua
diff --git a/tex/context/base/l-os.lua b/tex/context/base/mkiv/l-os.lua
index 0a86ea6d6..0a86ea6d6 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/mkiv/l-os.lua
diff --git a/tex/context/base/l-package.lua b/tex/context/base/mkiv/l-package.lua
index 075fcde25..075fcde25 100644
--- a/tex/context/base/l-package.lua
+++ b/tex/context/base/mkiv/l-package.lua
diff --git a/tex/context/base/l-pdfview.lua b/tex/context/base/mkiv/l-pdfview.lua
index 6302fd6f6..6302fd6f6 100644
--- a/tex/context/base/l-pdfview.lua
+++ b/tex/context/base/mkiv/l-pdfview.lua
diff --git a/tex/context/base/l-sandbox.lua b/tex/context/base/mkiv/l-sandbox.lua
index f7901379c..f7901379c 100644
--- a/tex/context/base/l-sandbox.lua
+++ b/tex/context/base/mkiv/l-sandbox.lua
diff --git a/tex/context/base/l-set.lua b/tex/context/base/mkiv/l-set.lua
index 2370f0139..2370f0139 100644
--- a/tex/context/base/l-set.lua
+++ b/tex/context/base/mkiv/l-set.lua
diff --git a/tex/context/base/l-string.lua b/tex/context/base/mkiv/l-string.lua
index e9dc2bbbc..e9dc2bbbc 100644
--- a/tex/context/base/l-string.lua
+++ b/tex/context/base/mkiv/l-string.lua
diff --git a/tex/context/base/l-table.lua b/tex/context/base/mkiv/l-table.lua
index 552097e1c..552097e1c 100644
--- a/tex/context/base/l-table.lua
+++ b/tex/context/base/mkiv/l-table.lua
diff --git a/tex/context/base/l-unicode.lua b/tex/context/base/mkiv/l-unicode.lua
index 70b60324a..70b60324a 100644
--- a/tex/context/base/l-unicode.lua
+++ b/tex/context/base/mkiv/l-unicode.lua
diff --git a/tex/context/base/l-url.lua b/tex/context/base/mkiv/l-url.lua
index b189ec5bb..b189ec5bb 100644
--- a/tex/context/base/l-url.lua
+++ b/tex/context/base/mkiv/l-url.lua
diff --git a/tex/context/base/l-xml.lua b/tex/context/base/mkiv/l-xml.lua
index 14e97337b..14e97337b 100644
--- a/tex/context/base/l-xml.lua
+++ b/tex/context/base/mkiv/l-xml.lua
diff --git a/tex/context/base/lang-def.lua b/tex/context/base/mkiv/lang-def.lua
index c0c3981f7..c0c3981f7 100644
--- a/tex/context/base/lang-def.lua
+++ b/tex/context/base/mkiv/lang-def.lua
diff --git a/tex/context/base/lang-def.mkiv b/tex/context/base/mkiv/lang-def.mkiv
index 895aa27e5..895aa27e5 100644
--- a/tex/context/base/lang-def.mkiv
+++ b/tex/context/base/mkiv/lang-def.mkiv
diff --git a/tex/context/base/lang-dis.lua b/tex/context/base/mkiv/lang-dis.lua
index ab62cc479..ab62cc479 100644
--- a/tex/context/base/lang-dis.lua
+++ b/tex/context/base/mkiv/lang-dis.lua
diff --git a/tex/context/base/lang-frd.mkiv b/tex/context/base/mkiv/lang-frd.mkiv
index 352e5016d..352e5016d 100644
--- a/tex/context/base/lang-frd.mkiv
+++ b/tex/context/base/mkiv/lang-frd.mkiv
diff --git a/tex/context/base/lang-frq-de.lua b/tex/context/base/mkiv/lang-frq-de.lua
index 3733f39f9..3733f39f9 100644
--- a/tex/context/base/lang-frq-de.lua
+++ b/tex/context/base/mkiv/lang-frq-de.lua
diff --git a/tex/context/base/lang-frq-en.lua b/tex/context/base/mkiv/lang-frq-en.lua
index 9e18d7166..9e18d7166 100644
--- a/tex/context/base/lang-frq-en.lua
+++ b/tex/context/base/mkiv/lang-frq-en.lua
diff --git a/tex/context/base/lang-frq-nl.lua b/tex/context/base/mkiv/lang-frq-nl.lua
index 7b640b779..7b640b779 100644
--- a/tex/context/base/lang-frq-nl.lua
+++ b/tex/context/base/mkiv/lang-frq-nl.lua
diff --git a/tex/context/base/lang-frq.mkiv b/tex/context/base/mkiv/lang-frq.mkiv
index eaa93281a..eaa93281a 100644
--- a/tex/context/base/lang-frq.mkiv
+++ b/tex/context/base/mkiv/lang-frq.mkiv
diff --git a/tex/context/base/lang-hyp.lua b/tex/context/base/mkiv/lang-hyp.lua
index d1260b8b4..d1260b8b4 100644
--- a/tex/context/base/lang-hyp.lua
+++ b/tex/context/base/mkiv/lang-hyp.lua
diff --git a/tex/context/base/lang-hyp.mkiv b/tex/context/base/mkiv/lang-hyp.mkiv
index e3f032c6b..e3f032c6b 100644
--- a/tex/context/base/lang-hyp.mkiv
+++ b/tex/context/base/mkiv/lang-hyp.mkiv
diff --git a/tex/context/base/lang-ini.lua b/tex/context/base/mkiv/lang-ini.lua
index 46ccdec35..46ccdec35 100644
--- a/tex/context/base/lang-ini.lua
+++ b/tex/context/base/mkiv/lang-ini.lua
diff --git a/tex/context/base/lang-ini.mkiv b/tex/context/base/mkiv/lang-ini.mkiv
index 8ff41b287..8ff41b287 100644
--- a/tex/context/base/lang-ini.mkiv
+++ b/tex/context/base/mkiv/lang-ini.mkiv
diff --git a/tex/context/base/lang-lab.lua b/tex/context/base/mkiv/lang-lab.lua
index f5ae6de5e..f5ae6de5e 100644
--- a/tex/context/base/lang-lab.lua
+++ b/tex/context/base/mkiv/lang-lab.lua
diff --git a/tex/context/base/lang-lab.mkiv b/tex/context/base/mkiv/lang-lab.mkiv
index 17d583b0e..17d583b0e 100644
--- a/tex/context/base/lang-lab.mkiv
+++ b/tex/context/base/mkiv/lang-lab.mkiv
diff --git a/tex/context/base/lang-mis.mkiv b/tex/context/base/mkiv/lang-mis.mkiv
index f442042e2..f442042e2 100644
--- a/tex/context/base/lang-mis.mkiv
+++ b/tex/context/base/mkiv/lang-mis.mkiv
diff --git a/tex/context/base/lang-rep.lua b/tex/context/base/mkiv/lang-rep.lua
index 0090d7cc3..0090d7cc3 100644
--- a/tex/context/base/lang-rep.lua
+++ b/tex/context/base/mkiv/lang-rep.lua
diff --git a/tex/context/base/lang-rep.mkiv b/tex/context/base/mkiv/lang-rep.mkiv
index a98d51f6c..a98d51f6c 100644
--- a/tex/context/base/lang-rep.mkiv
+++ b/tex/context/base/mkiv/lang-rep.mkiv
diff --git a/tex/context/base/lang-spa.mkiv b/tex/context/base/mkiv/lang-spa.mkiv
index e7cb0025f..e7cb0025f 100644
--- a/tex/context/base/lang-spa.mkiv
+++ b/tex/context/base/mkiv/lang-spa.mkiv
diff --git a/tex/context/base/lang-txt.lua b/tex/context/base/mkiv/lang-txt.lua
index 2938550ee..2938550ee 100644
--- a/tex/context/base/lang-txt.lua
+++ b/tex/context/base/mkiv/lang-txt.lua
diff --git a/tex/context/base/lang-url.lua b/tex/context/base/mkiv/lang-url.lua
index 39418beef..39418beef 100644
--- a/tex/context/base/lang-url.lua
+++ b/tex/context/base/mkiv/lang-url.lua
diff --git a/tex/context/base/lang-url.mkiv b/tex/context/base/mkiv/lang-url.mkiv
index e7d62ba01..e7d62ba01 100644
--- a/tex/context/base/lang-url.mkiv
+++ b/tex/context/base/mkiv/lang-url.mkiv
diff --git a/tex/context/base/lang-wrd.lua b/tex/context/base/mkiv/lang-wrd.lua
index b564a02ae..b564a02ae 100644
--- a/tex/context/base/lang-wrd.lua
+++ b/tex/context/base/mkiv/lang-wrd.lua
diff --git a/tex/context/base/lang-wrd.mkiv b/tex/context/base/mkiv/lang-wrd.mkiv
index 8c544773b..8c544773b 100644
--- a/tex/context/base/lang-wrd.mkiv
+++ b/tex/context/base/mkiv/lang-wrd.mkiv
diff --git a/tex/context/base/layo-ini.lua b/tex/context/base/mkiv/layo-ini.lua
index d35d7ef69..d35d7ef69 100644
--- a/tex/context/base/layo-ini.lua
+++ b/tex/context/base/mkiv/layo-ini.lua
diff --git a/tex/context/base/layo-ini.mkiv b/tex/context/base/mkiv/layo-ini.mkiv
index 9097265c9..9097265c9 100644
--- a/tex/context/base/layo-ini.mkiv
+++ b/tex/context/base/mkiv/layo-ini.mkiv
diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/mkiv/lpdf-ano.lua
index 94cc41412..94cc41412 100644
--- a/tex/context/base/lpdf-ano.lua
+++ b/tex/context/base/mkiv/lpdf-ano.lua
diff --git a/tex/context/base/lpdf-col.lua b/tex/context/base/mkiv/lpdf-col.lua
index 877c01a1c..877c01a1c 100644
--- a/tex/context/base/lpdf-col.lua
+++ b/tex/context/base/mkiv/lpdf-col.lua
diff --git a/tex/context/base/lpdf-enc.lua b/tex/context/base/mkiv/lpdf-enc.lua
index 090fb15cd..090fb15cd 100644
--- a/tex/context/base/lpdf-enc.lua
+++ b/tex/context/base/mkiv/lpdf-enc.lua
diff --git a/tex/context/base/lpdf-epa.lua b/tex/context/base/mkiv/lpdf-epa.lua
index c72e2a424..c72e2a424 100644
--- a/tex/context/base/lpdf-epa.lua
+++ b/tex/context/base/mkiv/lpdf-epa.lua
diff --git a/tex/context/base/lpdf-epd.lua b/tex/context/base/mkiv/lpdf-epd.lua
index d6a0f00bc..d6a0f00bc 100644
--- a/tex/context/base/lpdf-epd.lua
+++ b/tex/context/base/mkiv/lpdf-epd.lua
diff --git a/tex/context/base/lpdf-fld.lua b/tex/context/base/mkiv/lpdf-fld.lua
index 7e2cd4bdf..7e2cd4bdf 100644
--- a/tex/context/base/lpdf-fld.lua
+++ b/tex/context/base/mkiv/lpdf-fld.lua
diff --git a/tex/context/base/lpdf-fmt.lua b/tex/context/base/mkiv/lpdf-fmt.lua
index ba9bc8f9c..84e4f1c38 100644
--- a/tex/context/base/lpdf-fmt.lua
+++ b/tex/context/base/mkiv/lpdf-fmt.lua
@@ -202,7 +202,7 @@ local formats = utilities.storage.allocate {
         inject_metadata         = function()
             injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-4</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
             insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:VersionID>1</xmpMM:VersionID>",false)
-            insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:RenditionClass>default</xmpMM:RenditonClass>",false)
+            insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:RenditionClass>default</xmpMM:RenditionClass>",false)
         end
     },
     ["pdf/x-4p"] = {
@@ -227,7 +227,7 @@ local formats = utilities.storage.allocate {
         inject_metadata         = function()
             injectxmpinfo("xml://rdf:RDF","<rdf:Description rdf:about='' xmlns:pdfxid='http://www.npes.org/pdfx/ns/id/'><pdfxid:GTS_PDFXVersion>PDF/X-4p</pdfxid:GTS_PDFXVersion></rdf:Description>",false)
             insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:VersionID>1</xmpMM:VersionID>",false)
-            insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:RenditionClass>default</xmpMM:RenditonClass>",false)
+            insertxmpinfo("xml://rdf:Description/xmpMM:InstanceID","<xmpMM:RenditionClass>default</xmpMM:RenditionClass>",false)
         end
     },
     ["pdf/x-5g"] = {
diff --git a/tex/context/base/lpdf-grp.lua b/tex/context/base/mkiv/lpdf-grp.lua
index 0eac52dfb..0eac52dfb 100644
--- a/tex/context/base/lpdf-grp.lua
+++ b/tex/context/base/mkiv/lpdf-grp.lua
diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index 6bce56b43..6bce56b43 100644
--- a/tex/context/base/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
diff --git a/tex/context/base/lpdf-mis.lua b/tex/context/base/mkiv/lpdf-mis.lua
index 164e27c62..164e27c62 100644
--- a/tex/context/base/lpdf-mis.lua
+++ b/tex/context/base/mkiv/lpdf-mis.lua
diff --git a/tex/context/base/lpdf-mov.lua b/tex/context/base/mkiv/lpdf-mov.lua
index 87375e4ce..87375e4ce 100644
--- a/tex/context/base/lpdf-mov.lua
+++ b/tex/context/base/mkiv/lpdf-mov.lua
diff --git a/tex/context/base/lpdf-nod.lua b/tex/context/base/mkiv/lpdf-nod.lua
index 3dd5a6648..3dd5a6648 100644
--- a/tex/context/base/lpdf-nod.lua
+++ b/tex/context/base/mkiv/lpdf-nod.lua
diff --git a/tex/context/base/lpdf-pda.xml b/tex/context/base/mkiv/lpdf-pda.xml
index 3f6b969c0..3f6b969c0 100644
--- a/tex/context/base/lpdf-pda.xml
+++ b/tex/context/base/mkiv/lpdf-pda.xml
diff --git a/tex/context/base/lpdf-pdx.xml b/tex/context/base/mkiv/lpdf-pdx.xml
index d55e1fdf3..d55e1fdf3 100644
--- a/tex/context/base/lpdf-pdx.xml
+++ b/tex/context/base/mkiv/lpdf-pdx.xml
diff --git a/tex/context/base/lpdf-pua.xml b/tex/context/base/mkiv/lpdf-pua.xml
index c50e1f05b..c50e1f05b 100644
--- a/tex/context/base/lpdf-pua.xml
+++ b/tex/context/base/mkiv/lpdf-pua.xml
diff --git a/tex/context/base/lpdf-ren.lua b/tex/context/base/mkiv/lpdf-ren.lua
index 81b9e9f20..81b9e9f20 100644
--- a/tex/context/base/lpdf-ren.lua
+++ b/tex/context/base/mkiv/lpdf-ren.lua
diff --git a/tex/context/base/lpdf-res.lua b/tex/context/base/mkiv/lpdf-res.lua
index 587c54578..d13fc798e 100644
--- a/tex/context/base/lpdf-res.lua
+++ b/tex/context/base/mkiv/lpdf-res.lua
@@ -22,7 +22,7 @@ local useboxresource  = tex.useboxresource
 local getboxresource  = tex.getboxresourcedimensions
 
 function codeinjections.registerboxresource(n)
-    return saveboxresource(n,nil,lpdf.collectedresources)
+    return saveboxresource(n,nil,lpdf.collectedresources,true) -- direct
 end
 
 function codeinjections.restoreboxresource(index)
diff --git a/tex/context/base/lpdf-swf.lua b/tex/context/base/mkiv/lpdf-swf.lua
index 88cdcc4ec..88cdcc4ec 100644
--- a/tex/context/base/lpdf-swf.lua
+++ b/tex/context/base/mkiv/lpdf-swf.lua
diff --git a/tex/context/base/lpdf-tag.lua b/tex/context/base/mkiv/lpdf-tag.lua
index f20e4bfe8..f20e4bfe8 100644
--- a/tex/context/base/lpdf-tag.lua
+++ b/tex/context/base/mkiv/lpdf-tag.lua
diff --git a/tex/context/base/lpdf-u3d.lua b/tex/context/base/mkiv/lpdf-u3d.lua
index c9f4a0369..c9f4a0369 100644
--- a/tex/context/base/lpdf-u3d.lua
+++ b/tex/context/base/mkiv/lpdf-u3d.lua
diff --git a/tex/context/base/lpdf-wid.lua b/tex/context/base/mkiv/lpdf-wid.lua
index 22971c2b7..73a56caa3 100644
--- a/tex/context/base/lpdf-wid.lua
+++ b/tex/context/base/mkiv/lpdf-wid.lua
@@ -177,6 +177,7 @@ local function analyzetransparency(transparencyvalue)
 end
 
 -- Attachments
+
 local nofattachments    = 0
 local attachments       = { }
 local filestreams       = { }
diff --git a/tex/context/base/lpdf-xmp.lua b/tex/context/base/mkiv/lpdf-xmp.lua
index 4526b3738..4526b3738 100644
--- a/tex/context/base/lpdf-xmp.lua
+++ b/tex/context/base/mkiv/lpdf-xmp.lua
diff --git a/tex/context/base/luat-bas.mkiv b/tex/context/base/mkiv/luat-bas.mkiv
index cb00d8f55..cb00d8f55 100644
--- a/tex/context/base/luat-bas.mkiv
+++ b/tex/context/base/mkiv/luat-bas.mkiv
diff --git a/tex/context/base/luat-bwc.lua b/tex/context/base/mkiv/luat-bwc.lua
index 993de7bf3..993de7bf3 100644
--- a/tex/context/base/luat-bwc.lua
+++ b/tex/context/base/mkiv/luat-bwc.lua
diff --git a/tex/context/base/luat-cbk.lua b/tex/context/base/mkiv/luat-cbk.lua
index 5e2d0e0cb..5e2d0e0cb 100644
--- a/tex/context/base/luat-cbk.lua
+++ b/tex/context/base/mkiv/luat-cbk.lua
diff --git a/tex/context/base/luat-cnf.lua b/tex/context/base/mkiv/luat-cnf.lua
index 0f6b8598f..0f6b8598f 100644
--- a/tex/context/base/luat-cnf.lua
+++ b/tex/context/base/mkiv/luat-cnf.lua
diff --git a/tex/context/base/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index 51610ee87..51610ee87 100644
--- a/tex/context/base/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
diff --git a/tex/context/base/luat-cod.mkiv b/tex/context/base/mkiv/luat-cod.mkiv
index 9ce6161c3..9ce6161c3 100644
--- a/tex/context/base/luat-cod.mkiv
+++ b/tex/context/base/mkiv/luat-cod.mkiv
diff --git a/tex/context/base/luat-env.lua b/tex/context/base/mkiv/luat-env.lua
index 5f2a0d281..5f2a0d281 100644
--- a/tex/context/base/luat-env.lua
+++ b/tex/context/base/mkiv/luat-env.lua
diff --git a/tex/context/base/luat-exe.lua b/tex/context/base/mkiv/luat-exe.lua
index d8d954a30..d8d954a30 100644
--- a/tex/context/base/luat-exe.lua
+++ b/tex/context/base/mkiv/luat-exe.lua
diff --git a/tex/context/base/luat-fio.lua b/tex/context/base/mkiv/luat-fio.lua
index daa6cccb7..daa6cccb7 100644
--- a/tex/context/base/luat-fio.lua
+++ b/tex/context/base/mkiv/luat-fio.lua
diff --git a/tex/context/base/luat-fmt.lua b/tex/context/base/mkiv/luat-fmt.lua
index 9a86ef50e..9a86ef50e 100644
--- a/tex/context/base/luat-fmt.lua
+++ b/tex/context/base/mkiv/luat-fmt.lua
diff --git a/tex/context/base/luat-ini.lua b/tex/context/base/mkiv/luat-ini.lua
index 34e83e7bb..34e83e7bb 100644
--- a/tex/context/base/luat-ini.lua
+++ b/tex/context/base/mkiv/luat-ini.lua
diff --git a/tex/context/base/luat-ini.mkiv b/tex/context/base/mkiv/luat-ini.mkiv
index e19b72d14..e19b72d14 100644
--- a/tex/context/base/luat-ini.mkiv
+++ b/tex/context/base/mkiv/luat-ini.mkiv
diff --git a/tex/context/base/luat-iop.lua b/tex/context/base/mkiv/luat-iop.lua
index e1772af4e..e1772af4e 100644
--- a/tex/context/base/luat-iop.lua
+++ b/tex/context/base/mkiv/luat-iop.lua
diff --git a/tex/context/base/luat-lib.mkiv b/tex/context/base/mkiv/luat-lib.mkiv
index cbe15c8a1..cbe15c8a1 100644
--- a/tex/context/base/luat-lib.mkiv
+++ b/tex/context/base/mkiv/luat-lib.mkiv
diff --git a/tex/context/base/luat-lua.lua b/tex/context/base/mkiv/luat-lua.lua
index 972004e88..972004e88 100644
--- a/tex/context/base/luat-lua.lua
+++ b/tex/context/base/mkiv/luat-lua.lua
diff --git a/tex/context/base/luat-mac.lua b/tex/context/base/mkiv/luat-mac.lua
index 6214e591e..6214e591e 100644
--- a/tex/context/base/luat-mac.lua
+++ b/tex/context/base/mkiv/luat-mac.lua
diff --git a/tex/context/base/luat-run.lua b/tex/context/base/mkiv/luat-run.lua
index 54450b28d..54450b28d 100644
--- a/tex/context/base/luat-run.lua
+++ b/tex/context/base/mkiv/luat-run.lua
diff --git a/tex/context/base/luat-soc.lua b/tex/context/base/mkiv/luat-soc.lua
index 9342a4b33..9342a4b33 100644
--- a/tex/context/base/luat-soc.lua
+++ b/tex/context/base/mkiv/luat-soc.lua
diff --git a/tex/context/base/luat-sta.lua b/tex/context/base/mkiv/luat-sta.lua
index 8b58774d3..8b58774d3 100644
--- a/tex/context/base/luat-sta.lua
+++ b/tex/context/base/mkiv/luat-sta.lua
diff --git a/tex/context/base/luat-sto.lua b/tex/context/base/mkiv/luat-sto.lua
index b04d655c2..b04d655c2 100644
--- a/tex/context/base/luat-sto.lua
+++ b/tex/context/base/mkiv/luat-sto.lua
diff --git a/tex/context/base/luat-usr.lua b/tex/context/base/mkiv/luat-usr.lua
index 071e3bf5b..071e3bf5b 100644
--- a/tex/context/base/luat-usr.lua
+++ b/tex/context/base/mkiv/luat-usr.lua
diff --git a/tex/context/base/luat-usr.mkiv b/tex/context/base/mkiv/luat-usr.mkiv
index 92d40010c..92d40010c 100644
--- a/tex/context/base/luat-usr.mkiv
+++ b/tex/context/base/mkiv/luat-usr.mkiv
diff --git a/tex/context/base/lxml-aux.lua b/tex/context/base/mkiv/lxml-aux.lua
index 01c2a8bfc..01c2a8bfc 100644
--- a/tex/context/base/lxml-aux.lua
+++ b/tex/context/base/mkiv/lxml-aux.lua
diff --git a/tex/context/base/lxml-css.lua b/tex/context/base/mkiv/lxml-css.lua
index fa921b24f..fa921b24f 100644
--- a/tex/context/base/lxml-css.lua
+++ b/tex/context/base/mkiv/lxml-css.lua
diff --git a/tex/context/base/lxml-css.mkiv b/tex/context/base/mkiv/lxml-css.mkiv
index 79de85c08..79de85c08 100644
--- a/tex/context/base/lxml-css.mkiv
+++ b/tex/context/base/mkiv/lxml-css.mkiv
diff --git a/tex/context/base/lxml-ctx.lua b/tex/context/base/mkiv/lxml-ctx.lua
index 677fd6a01..677fd6a01 100644
--- a/tex/context/base/lxml-ctx.lua
+++ b/tex/context/base/mkiv/lxml-ctx.lua
diff --git a/tex/context/base/lxml-ctx.mkiv b/tex/context/base/mkiv/lxml-ctx.mkiv
index 6691e36bb..6691e36bb 100644
--- a/tex/context/base/lxml-ctx.mkiv
+++ b/tex/context/base/mkiv/lxml-ctx.mkiv
diff --git a/tex/context/base/lxml-dir.lua b/tex/context/base/mkiv/lxml-dir.lua
index 48c0ac41e..48c0ac41e 100644
--- a/tex/context/base/lxml-dir.lua
+++ b/tex/context/base/mkiv/lxml-dir.lua
diff --git a/tex/context/base/lxml-ent.lua b/tex/context/base/mkiv/lxml-ent.lua
index a5c5bc389..a5c5bc389 100644
--- a/tex/context/base/lxml-ent.lua
+++ b/tex/context/base/mkiv/lxml-ent.lua
diff --git a/tex/context/base/lxml-inf.lua b/tex/context/base/mkiv/lxml-inf.lua
index 8f1157c7d..8f1157c7d 100644
--- a/tex/context/base/lxml-inf.lua
+++ b/tex/context/base/mkiv/lxml-inf.lua
diff --git a/tex/context/base/lxml-ini.lua b/tex/context/base/mkiv/lxml-ini.lua
index 379ea31b7..379ea31b7 100644
--- a/tex/context/base/lxml-ini.lua
+++ b/tex/context/base/mkiv/lxml-ini.lua
diff --git a/tex/context/base/lxml-ini.mkiv b/tex/context/base/mkiv/lxml-ini.mkiv
index 9f84f8ca3..9f84f8ca3 100644
--- a/tex/context/base/lxml-ini.mkiv
+++ b/tex/context/base/mkiv/lxml-ini.mkiv
diff --git a/tex/context/base/lxml-lpt.lua b/tex/context/base/mkiv/lxml-lpt.lua
index 6df89be20..6df89be20 100644
--- a/tex/context/base/lxml-lpt.lua
+++ b/tex/context/base/mkiv/lxml-lpt.lua
diff --git a/tex/context/base/lxml-mis.lua b/tex/context/base/mkiv/lxml-mis.lua
index 94a26b974..94a26b974 100644
--- a/tex/context/base/lxml-mis.lua
+++ b/tex/context/base/mkiv/lxml-mis.lua
diff --git a/tex/context/base/lxml-sor.lua b/tex/context/base/mkiv/lxml-sor.lua
index aba1c3b8d..aba1c3b8d 100644
--- a/tex/context/base/lxml-sor.lua
+++ b/tex/context/base/mkiv/lxml-sor.lua
diff --git a/tex/context/base/lxml-sor.mkiv b/tex/context/base/mkiv/lxml-sor.mkiv
index 0d8eb6ba1..0d8eb6ba1 100644
--- a/tex/context/base/lxml-sor.mkiv
+++ b/tex/context/base/mkiv/lxml-sor.mkiv
diff --git a/tex/context/base/lxml-tab.lua b/tex/context/base/mkiv/lxml-tab.lua
index 510ba1bd4..510ba1bd4 100644
--- a/tex/context/base/lxml-tab.lua
+++ b/tex/context/base/mkiv/lxml-tab.lua
diff --git a/tex/context/base/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua
index 7f375927e..7f375927e 100644
--- a/tex/context/base/lxml-tex.lua
+++ b/tex/context/base/mkiv/lxml-tex.lua
diff --git a/tex/context/base/lxml-xml.lua b/tex/context/base/mkiv/lxml-xml.lua
index d0e256078..d0e256078 100644
--- a/tex/context/base/lxml-xml.lua
+++ b/tex/context/base/mkiv/lxml-xml.lua
diff --git a/tex/context/base/m-newotf.mkiv b/tex/context/base/mkiv/m-newotf.mkiv
index 267d124fa..267d124fa 100644
--- a/tex/context/base/m-newotf.mkiv
+++ b/tex/context/base/mkiv/m-newotf.mkiv
diff --git a/tex/context/base/m-oldbibtex.mkiv b/tex/context/base/mkiv/m-oldbibtex.mkiv
index 08c23e7cc..08c23e7cc 100644
--- a/tex/context/base/m-oldbibtex.mkiv
+++ b/tex/context/base/mkiv/m-oldbibtex.mkiv
diff --git a/tex/context/base/m-oldotf.mkiv b/tex/context/base/mkiv/m-oldotf.mkiv
index 418d0bc2a..418d0bc2a 100644
--- a/tex/context/base/m-oldotf.mkiv
+++ b/tex/context/base/mkiv/m-oldotf.mkiv
diff --git a/tex/context/base/math-acc.mkvi b/tex/context/base/mkiv/math-acc.mkvi
index 415f2b91f..415f2b91f 100644
--- a/tex/context/base/math-acc.mkvi
+++ b/tex/context/base/mkiv/math-acc.mkvi
diff --git a/tex/context/base/math-act.lua b/tex/context/base/mkiv/math-act.lua
index d0ea78990..d0ea78990 100644
--- a/tex/context/base/math-act.lua
+++ b/tex/context/base/mkiv/math-act.lua
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv
index c0f105121..c0f105121 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/mkiv/math-ali.mkiv
diff --git a/tex/context/base/math-arr.mkiv b/tex/context/base/mkiv/math-arr.mkiv
index 9056bf5a4..9056bf5a4 100644
--- a/tex/context/base/math-arr.mkiv
+++ b/tex/context/base/mkiv/math-arr.mkiv
diff --git a/tex/context/base/math-def.mkiv b/tex/context/base/mkiv/math-def.mkiv
index a8af5af5c..a8af5af5c 100644
--- a/tex/context/base/math-def.mkiv
+++ b/tex/context/base/mkiv/math-def.mkiv
diff --git a/tex/context/base/math-del.mkiv b/tex/context/base/mkiv/math-del.mkiv
index 1245d31de..1245d31de 100644
--- a/tex/context/base/math-del.mkiv
+++ b/tex/context/base/mkiv/math-del.mkiv
diff --git a/tex/context/base/math-dim.lua b/tex/context/base/mkiv/math-dim.lua
index b5241cb5a..b5241cb5a 100644
--- a/tex/context/base/math-dim.lua
+++ b/tex/context/base/mkiv/math-dim.lua
diff --git a/tex/context/base/math-dir.lua b/tex/context/base/mkiv/math-dir.lua
index c9c2a38dd..c9c2a38dd 100644
--- a/tex/context/base/math-dir.lua
+++ b/tex/context/base/mkiv/math-dir.lua
diff --git a/tex/context/base/math-dis.mkiv b/tex/context/base/mkiv/math-dis.mkiv
index 5b70970f3..5b70970f3 100644
--- a/tex/context/base/math-dis.mkiv
+++ b/tex/context/base/mkiv/math-dis.mkiv
diff --git a/tex/context/base/math-ext.lua b/tex/context/base/mkiv/math-ext.lua
index b00d6cde2..b00d6cde2 100644
--- a/tex/context/base/math-ext.lua
+++ b/tex/context/base/mkiv/math-ext.lua
diff --git a/tex/context/base/math-fbk.lua b/tex/context/base/mkiv/math-fbk.lua
index 564ece8d7..564ece8d7 100644
--- a/tex/context/base/math-fbk.lua
+++ b/tex/context/base/mkiv/math-fbk.lua
diff --git a/tex/context/base/math-fen.mkiv b/tex/context/base/mkiv/math-fen.mkiv
index cff95db62..cff95db62 100644
--- a/tex/context/base/math-fen.mkiv
+++ b/tex/context/base/mkiv/math-fen.mkiv
diff --git a/tex/context/base/math-for.mkiv b/tex/context/base/mkiv/math-for.mkiv
index 0c8bd05ae..0c8bd05ae 100644
--- a/tex/context/base/math-for.mkiv
+++ b/tex/context/base/mkiv/math-for.mkiv
diff --git a/tex/context/base/math-frc.lua b/tex/context/base/mkiv/math-frc.lua
index 639edc94b..639edc94b 100644
--- a/tex/context/base/math-frc.lua
+++ b/tex/context/base/mkiv/math-frc.lua
diff --git a/tex/context/base/math-frc.mkiv b/tex/context/base/mkiv/math-frc.mkiv
index 785e8ea8e..785e8ea8e 100644
--- a/tex/context/base/math-frc.mkiv
+++ b/tex/context/base/mkiv/math-frc.mkiv
diff --git a/tex/context/base/math-ini.lua b/tex/context/base/mkiv/math-ini.lua
index e6a35c39e..e6a35c39e 100644
--- a/tex/context/base/math-ini.lua
+++ b/tex/context/base/mkiv/math-ini.lua
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 0cbfd6fc4..0cbfd6fc4 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
diff --git a/tex/context/base/math-inl.mkiv b/tex/context/base/mkiv/math-inl.mkiv
index 2c7284458..2c7284458 100644
--- a/tex/context/base/math-inl.mkiv
+++ b/tex/context/base/mkiv/math-inl.mkiv
diff --git a/tex/context/base/math-int.mkiv b/tex/context/base/mkiv/math-int.mkiv
index 5876eb7bb..5876eb7bb 100644
--- a/tex/context/base/math-int.mkiv
+++ b/tex/context/base/mkiv/math-int.mkiv
diff --git a/tex/context/base/math-map.lua b/tex/context/base/mkiv/math-map.lua
index 94dde4110..94dde4110 100644
--- a/tex/context/base/math-map.lua
+++ b/tex/context/base/mkiv/math-map.lua
diff --git a/tex/context/base/math-mis.mkiv b/tex/context/base/mkiv/math-mis.mkiv
index 6346da9a0..6346da9a0 100644
--- a/tex/context/base/math-mis.mkiv
+++ b/tex/context/base/mkiv/math-mis.mkiv
diff --git a/tex/context/base/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 878b1e9a1..878b1e9a1 100644
--- a/tex/context/base/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
diff --git a/tex/context/base/math-pln.mkiv b/tex/context/base/mkiv/math-pln.mkiv
index 5e4c43c81..5e4c43c81 100644
--- a/tex/context/base/math-pln.mkiv
+++ b/tex/context/base/mkiv/math-pln.mkiv
diff --git a/tex/context/base/math-rad.mkvi b/tex/context/base/mkiv/math-rad.mkvi
index 113d4af50..113d4af50 100644
--- a/tex/context/base/math-rad.mkvi
+++ b/tex/context/base/mkiv/math-rad.mkvi
diff --git a/tex/context/base/math-ren.lua b/tex/context/base/mkiv/math-ren.lua
index 4628ffe55..4628ffe55 100644
--- a/tex/context/base/math-ren.lua
+++ b/tex/context/base/mkiv/math-ren.lua
diff --git a/tex/context/base/math-scr.mkiv b/tex/context/base/mkiv/math-scr.mkiv
index 2decaa81f..2decaa81f 100644
--- a/tex/context/base/math-scr.mkiv
+++ b/tex/context/base/mkiv/math-scr.mkiv
diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/mkiv/math-stc.mkvi
index 96e1738db..96e1738db 100644
--- a/tex/context/base/math-stc.mkvi
+++ b/tex/context/base/mkiv/math-stc.mkvi
diff --git a/tex/context/base/math-tag.lua b/tex/context/base/mkiv/math-tag.lua
index e83b401fb..e83b401fb 100644
--- a/tex/context/base/math-tag.lua
+++ b/tex/context/base/mkiv/math-tag.lua
diff --git a/tex/context/base/math-ttv.lua b/tex/context/base/mkiv/math-ttv.lua
index 1f644e788..1f644e788 100644
--- a/tex/context/base/math-ttv.lua
+++ b/tex/context/base/mkiv/math-ttv.lua
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/mkiv/math-vfu.lua
index a683e02cf..a683e02cf 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/mkiv/math-vfu.lua
diff --git a/tex/context/base/meta-fig.mkiv b/tex/context/base/mkiv/meta-fig.mkiv
index bf37aa7bf..bf37aa7bf 100644
--- a/tex/context/base/meta-fig.mkiv
+++ b/tex/context/base/mkiv/meta-fig.mkiv
diff --git a/tex/context/base/meta-fnt.lua b/tex/context/base/mkiv/meta-fnt.lua
index 95bdfa6d9..95bdfa6d9 100644
--- a/tex/context/base/meta-fnt.lua
+++ b/tex/context/base/mkiv/meta-fnt.lua
diff --git a/tex/context/base/meta-fnt.mkiv b/tex/context/base/mkiv/meta-fnt.mkiv
index e54c0be0a..e54c0be0a 100644
--- a/tex/context/base/meta-fnt.mkiv
+++ b/tex/context/base/mkiv/meta-fnt.mkiv
diff --git a/tex/context/base/meta-fun.lua b/tex/context/base/mkiv/meta-fun.lua
index 7aaaf2818..7aaaf2818 100644
--- a/tex/context/base/meta-fun.lua
+++ b/tex/context/base/mkiv/meta-fun.lua
diff --git a/tex/context/base/meta-fun.mkiv b/tex/context/base/mkiv/meta-fun.mkiv
index c3a4ce8d4..c3a4ce8d4 100644
--- a/tex/context/base/meta-fun.mkiv
+++ b/tex/context/base/mkiv/meta-fun.mkiv
diff --git a/tex/context/base/meta-grd.mkiv b/tex/context/base/mkiv/meta-grd.mkiv
index da410ba68..da410ba68 100644
--- a/tex/context/base/meta-grd.mkiv
+++ b/tex/context/base/mkiv/meta-grd.mkiv
diff --git a/tex/context/base/meta-imp-clp.mkiv b/tex/context/base/mkiv/meta-imp-clp.mkiv
index 5c9206dee..5c9206dee 100644
--- a/tex/context/base/meta-imp-clp.mkiv
+++ b/tex/context/base/mkiv/meta-imp-clp.mkiv
diff --git a/tex/context/base/meta-imp-dum.mkiv b/tex/context/base/mkiv/meta-imp-dum.mkiv
index e6ccc234c..e6ccc234c 100644
--- a/tex/context/base/meta-imp-dum.mkiv
+++ b/tex/context/base/mkiv/meta-imp-dum.mkiv
diff --git a/tex/context/base/meta-imp-fen.mkiv b/tex/context/base/mkiv/meta-imp-fen.mkiv
index 307a59b4d..307a59b4d 100644
--- a/tex/context/base/meta-imp-fen.mkiv
+++ b/tex/context/base/mkiv/meta-imp-fen.mkiv
diff --git a/tex/context/base/meta-imp-mis.mkiv b/tex/context/base/mkiv/meta-imp-mis.mkiv
index e8282c381..e8282c381 100644
--- a/tex/context/base/meta-imp-mis.mkiv
+++ b/tex/context/base/mkiv/meta-imp-mis.mkiv
diff --git a/tex/context/base/meta-imp-nav.mkiv b/tex/context/base/mkiv/meta-imp-nav.mkiv
index 45a31ba5e..45a31ba5e 100644
--- a/tex/context/base/meta-imp-nav.mkiv
+++ b/tex/context/base/mkiv/meta-imp-nav.mkiv
diff --git a/tex/context/base/meta-imp-outlines.mkiv b/tex/context/base/mkiv/meta-imp-outlines.mkiv
index 7d7495037..7d7495037 100644
--- a/tex/context/base/meta-imp-outlines.mkiv
+++ b/tex/context/base/mkiv/meta-imp-outlines.mkiv
diff --git a/tex/context/base/meta-imp-pre.mkiv b/tex/context/base/mkiv/meta-imp-pre.mkiv
index 098be030b..098be030b 100644
--- a/tex/context/base/meta-imp-pre.mkiv
+++ b/tex/context/base/mkiv/meta-imp-pre.mkiv
diff --git a/tex/context/base/meta-imp-tab.mkiv b/tex/context/base/mkiv/meta-imp-tab.mkiv
index a4affbea4..a4affbea4 100644
--- a/tex/context/base/meta-imp-tab.mkiv
+++ b/tex/context/base/mkiv/meta-imp-tab.mkiv
diff --git a/tex/context/base/meta-imp-txt.mkiv b/tex/context/base/mkiv/meta-imp-txt.mkiv
index 7069d21a4..7069d21a4 100644
--- a/tex/context/base/meta-imp-txt.mkiv
+++ b/tex/context/base/mkiv/meta-imp-txt.mkiv
diff --git a/tex/context/base/meta-ini.lua b/tex/context/base/mkiv/meta-ini.lua
index 8f7131263..8f7131263 100644
--- a/tex/context/base/meta-ini.lua
+++ b/tex/context/base/mkiv/meta-ini.lua
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/mkiv/meta-ini.mkiv
index 9f53aea69..9f53aea69 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/mkiv/meta-ini.mkiv
diff --git a/tex/context/base/meta-pag.mkiv b/tex/context/base/mkiv/meta-pag.mkiv
index 6b6abd211..6b6abd211 100644
--- a/tex/context/base/meta-pag.mkiv
+++ b/tex/context/base/mkiv/meta-pag.mkiv
diff --git a/tex/context/base/meta-pdf.lua b/tex/context/base/mkiv/meta-pdf.lua
index 3cbff63b1..3cbff63b1 100644
--- a/tex/context/base/meta-pdf.lua
+++ b/tex/context/base/mkiv/meta-pdf.lua
diff --git a/tex/context/base/meta-pdf.mkiv b/tex/context/base/mkiv/meta-pdf.mkiv
index 14c97042e..14c97042e 100644
--- a/tex/context/base/meta-pdf.mkiv
+++ b/tex/context/base/mkiv/meta-pdf.mkiv
diff --git a/tex/context/base/meta-pdh.lua b/tex/context/base/mkiv/meta-pdh.lua
index 5040715c4..5040715c4 100644
--- a/tex/context/base/meta-pdh.lua
+++ b/tex/context/base/mkiv/meta-pdh.lua
diff --git a/tex/context/base/meta-pdh.mkiv b/tex/context/base/mkiv/meta-pdh.mkiv
index 3787a5638..3787a5638 100644
--- a/tex/context/base/meta-pdh.mkiv
+++ b/tex/context/base/mkiv/meta-pdh.mkiv
diff --git a/tex/context/base/meta-tex.lua b/tex/context/base/mkiv/meta-tex.lua
index 1008e45c0..1008e45c0 100644
--- a/tex/context/base/meta-tex.lua
+++ b/tex/context/base/mkiv/meta-tex.lua
diff --git a/tex/context/base/meta-tex.mkiv b/tex/context/base/mkiv/meta-tex.mkiv
index 35b5c133b..35b5c133b 100644
--- a/tex/context/base/meta-tex.mkiv
+++ b/tex/context/base/mkiv/meta-tex.mkiv
diff --git a/tex/context/base/meta-xml.mkiv b/tex/context/base/mkiv/meta-xml.mkiv
index bd93bda8c..bd93bda8c 100644
--- a/tex/context/base/meta-xml.mkiv
+++ b/tex/context/base/mkiv/meta-xml.mkiv
diff --git a/tex/context/base/metatex.lus b/tex/context/base/mkiv/metatex.lus
index df7bc1914..df7bc1914 100644
--- a/tex/context/base/metatex.lus
+++ b/tex/context/base/mkiv/metatex.lus
diff --git a/tex/context/base/metatex.tex b/tex/context/base/mkiv/metatex.tex
index b5f54c4ee..b5f54c4ee 100644
--- a/tex/context/base/metatex.tex
+++ b/tex/context/base/mkiv/metatex.tex
diff --git a/tex/context/base/mlib-ctx.lua b/tex/context/base/mkiv/mlib-ctx.lua
index 3fe7118b7..3fe7118b7 100644
--- a/tex/context/base/mlib-ctx.lua
+++ b/tex/context/base/mkiv/mlib-ctx.lua
diff --git a/tex/context/base/mlib-ctx.mkiv b/tex/context/base/mkiv/mlib-ctx.mkiv
index a7bb612c8..a7bb612c8 100644
--- a/tex/context/base/mlib-ctx.mkiv
+++ b/tex/context/base/mkiv/mlib-ctx.mkiv
diff --git a/tex/context/base/mlib-int.lua b/tex/context/base/mkiv/mlib-int.lua
index 6d219fe04..6d219fe04 100644
--- a/tex/context/base/mlib-int.lua
+++ b/tex/context/base/mkiv/mlib-int.lua
diff --git a/tex/context/base/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua
index e7f8f9cc5..e7f8f9cc5 100644
--- a/tex/context/base/mlib-lua.lua
+++ b/tex/context/base/mkiv/mlib-lua.lua
diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mkiv/mlib-pdf.lua
index fb76a52e3..fb76a52e3 100644
--- a/tex/context/base/mlib-pdf.lua
+++ b/tex/context/base/mkiv/mlib-pdf.lua
diff --git a/tex/context/base/mlib-pdf.mkiv b/tex/context/base/mkiv/mlib-pdf.mkiv
index 78dab716d..78dab716d 100644
--- a/tex/context/base/mlib-pdf.mkiv
+++ b/tex/context/base/mkiv/mlib-pdf.mkiv
diff --git a/tex/context/base/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua
index a14d6c409..a14d6c409 100644
--- a/tex/context/base/mlib-pps.lua
+++ b/tex/context/base/mkiv/mlib-pps.lua
diff --git a/tex/context/base/mlib-pps.mkiv b/tex/context/base/mkiv/mlib-pps.mkiv
index cdccfc379..cdccfc379 100644
--- a/tex/context/base/mlib-pps.mkiv
+++ b/tex/context/base/mkiv/mlib-pps.mkiv
diff --git a/tex/context/base/mlib-run.lua b/tex/context/base/mkiv/mlib-run.lua
index 5ec1f9c6b..5ec1f9c6b 100644
--- a/tex/context/base/mlib-run.lua
+++ b/tex/context/base/mkiv/mlib-run.lua
diff --git a/tex/context/base/mtx-context-arrange.tex b/tex/context/base/mkiv/mtx-context-arrange.tex
index a3e6e9db3..a3e6e9db3 100644
--- a/tex/context/base/mtx-context-arrange.tex
+++ b/tex/context/base/mkiv/mtx-context-arrange.tex
diff --git a/tex/context/base/mtx-context-combine.tex b/tex/context/base/mkiv/mtx-context-combine.tex
index 05e31d800..05e31d800 100644
--- a/tex/context/base/mtx-context-combine.tex
+++ b/tex/context/base/mkiv/mtx-context-combine.tex
diff --git a/tex/context/base/mtx-context-common.tex b/tex/context/base/mkiv/mtx-context-common.tex
index 2db0a5be2..2db0a5be2 100644
--- a/tex/context/base/mtx-context-common.tex
+++ b/tex/context/base/mkiv/mtx-context-common.tex
diff --git a/tex/context/base/mtx-context-copy.tex b/tex/context/base/mkiv/mtx-context-copy.tex
index b798b3f8d..b798b3f8d 100644
--- a/tex/context/base/mtx-context-copy.tex
+++ b/tex/context/base/mkiv/mtx-context-copy.tex
diff --git a/tex/context/base/mtx-context-ideas.tex b/tex/context/base/mkiv/mtx-context-ideas.tex
index d10eefc76..d10eefc76 100644
--- a/tex/context/base/mtx-context-ideas.tex
+++ b/tex/context/base/mkiv/mtx-context-ideas.tex
diff --git a/tex/context/base/mtx-context-listing.tex b/tex/context/base/mkiv/mtx-context-listing.tex
index 2deffd795..2deffd795 100644
--- a/tex/context/base/mtx-context-listing.tex
+++ b/tex/context/base/mkiv/mtx-context-listing.tex
diff --git a/tex/context/base/mtx-context-markdown.tex b/tex/context/base/mkiv/mtx-context-markdown.tex
index 1bd57945f..1bd57945f 100644
--- a/tex/context/base/mtx-context-markdown.tex
+++ b/tex/context/base/mkiv/mtx-context-markdown.tex
diff --git a/tex/context/base/mtx-context-precache.tex b/tex/context/base/mkiv/mtx-context-precache.tex
index 9cbb46cf2..9cbb46cf2 100644
--- a/tex/context/base/mtx-context-precache.tex
+++ b/tex/context/base/mkiv/mtx-context-precache.tex
diff --git a/tex/context/base/mtx-context-select.tex b/tex/context/base/mkiv/mtx-context-select.tex
index 2f63f5955..2f63f5955 100644
--- a/tex/context/base/mtx-context-select.tex
+++ b/tex/context/base/mkiv/mtx-context-select.tex
diff --git a/tex/context/base/mtx-context-sql.tex b/tex/context/base/mkiv/mtx-context-sql.tex
index 16613c245..16613c245 100644
--- a/tex/context/base/mtx-context-sql.tex
+++ b/tex/context/base/mkiv/mtx-context-sql.tex
diff --git a/tex/context/base/mtx-context-timing.tex b/tex/context/base/mkiv/mtx-context-timing.tex
index c545c768f..c545c768f 100644
--- a/tex/context/base/mtx-context-timing.tex
+++ b/tex/context/base/mkiv/mtx-context-timing.tex
diff --git a/tex/context/base/mtx-context-xml.tex b/tex/context/base/mkiv/mtx-context-xml.tex
index eeaca3213..eeaca3213 100644
--- a/tex/context/base/mtx-context-xml.tex
+++ b/tex/context/base/mkiv/mtx-context-xml.tex
diff --git a/tex/context/base/mult-aux.lua b/tex/context/base/mkiv/mult-aux.lua
index 353b5e69c..353b5e69c 100644
--- a/tex/context/base/mult-aux.lua
+++ b/tex/context/base/mkiv/mult-aux.lua
diff --git a/tex/context/base/mult-aux.mkiv b/tex/context/base/mkiv/mult-aux.mkiv
index 693edc90e..693edc90e 100644
--- a/tex/context/base/mult-aux.mkiv
+++ b/tex/context/base/mkiv/mult-aux.mkiv
diff --git a/tex/context/base/mult-chk.lua b/tex/context/base/mkiv/mult-chk.lua
index 44a9f739f..44a9f739f 100644
--- a/tex/context/base/mult-chk.lua
+++ b/tex/context/base/mkiv/mult-chk.lua
diff --git a/tex/context/base/mult-chk.mkiv b/tex/context/base/mkiv/mult-chk.mkiv
index 9208a73e1..9208a73e1 100644
--- a/tex/context/base/mult-chk.mkiv
+++ b/tex/context/base/mkiv/mult-chk.mkiv
diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index c9bc10260..c9bc10260 100644
--- a/tex/context/base/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
diff --git a/tex/context/base/mult-def.mkiv b/tex/context/base/mkiv/mult-def.mkiv
index d9404bc16..d9404bc16 100644
--- a/tex/context/base/mult-def.mkiv
+++ b/tex/context/base/mkiv/mult-def.mkiv
diff --git a/tex/context/base/mult-dim.mkvi b/tex/context/base/mkiv/mult-dim.mkvi
index 6e2b22038..6e2b22038 100644
--- a/tex/context/base/mult-dim.mkvi
+++ b/tex/context/base/mkiv/mult-dim.mkvi
diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index 6be8e83db..6be8e83db 100644
--- a/tex/context/base/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
diff --git a/tex/context/base/mult-ini.lua b/tex/context/base/mkiv/mult-ini.lua
index c51c4c3d4..c51c4c3d4 100644
--- a/tex/context/base/mult-ini.lua
+++ b/tex/context/base/mkiv/mult-ini.lua
diff --git a/tex/context/base/mult-ini.mkiv b/tex/context/base/mkiv/mult-ini.mkiv
index 57403ea4f..57403ea4f 100644
--- a/tex/context/base/mult-ini.mkiv
+++ b/tex/context/base/mkiv/mult-ini.mkiv
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 9b363d2d6..9b363d2d6 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
diff --git a/tex/context/base/mult-mes.lua b/tex/context/base/mkiv/mult-mes.lua
index 979831726..979831726 100644
--- a/tex/context/base/mult-mes.lua
+++ b/tex/context/base/mkiv/mult-mes.lua
diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua
index a6bebc266..a6bebc266 100644
--- a/tex/context/base/mult-mps.lua
+++ b/tex/context/base/mkiv/mult-mps.lua
diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 9a91d9a4e..4363e8d5e 100644
--- a/tex/context/base/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -403,6 +403,7 @@ return {
   "pdffontname",
   "pdffontobjnum",
   "pdffontsize",
+  "pdfxformmargin",
   "pdfgamma",
   "pdfgentounicode",
   "pdfglyphtounicode",
@@ -1019,6 +1020,7 @@ return {
   "pdffontname",
   "pdffontobjnum",
   "pdffontsize",
+  "pdfxformmargin",
   "pdfgamma",
   "pdfgentounicode",
   "pdfglyphtounicode",
diff --git a/tex/context/base/mult-prm.mkiv b/tex/context/base/mkiv/mult-prm.mkiv
index e385341c2..e385341c2 100644
--- a/tex/context/base/mult-prm.mkiv
+++ b/tex/context/base/mkiv/mult-prm.mkiv
diff --git a/tex/context/base/mult-sys.mkiv b/tex/context/base/mkiv/mult-sys.mkiv
index 01a1674dc..01a1674dc 100644
--- a/tex/context/base/mult-sys.mkiv
+++ b/tex/context/base/mkiv/mult-sys.mkiv
diff --git a/tex/context/base/node-acc.lua b/tex/context/base/mkiv/node-acc.lua
index 407e808cd..407e808cd 100644
--- a/tex/context/base/node-acc.lua
+++ b/tex/context/base/mkiv/node-acc.lua
diff --git a/tex/context/base/node-aux.lua b/tex/context/base/mkiv/node-aux.lua
index 38df55eef..38df55eef 100644
--- a/tex/context/base/node-aux.lua
+++ b/tex/context/base/mkiv/node-aux.lua
diff --git a/tex/context/base/node-bck.lua b/tex/context/base/mkiv/node-bck.lua
index a095ac4c4..a095ac4c4 100644
--- a/tex/context/base/node-bck.lua
+++ b/tex/context/base/mkiv/node-bck.lua
diff --git a/tex/context/base/node-bck.mkiv b/tex/context/base/mkiv/node-bck.mkiv
index ed927cf0d..ed927cf0d 100644
--- a/tex/context/base/node-bck.mkiv
+++ b/tex/context/base/mkiv/node-bck.mkiv
diff --git a/tex/context/base/node-dir.lua b/tex/context/base/mkiv/node-dir.lua
index 6ee5cd4b8..6ee5cd4b8 100644
--- a/tex/context/base/node-dir.lua
+++ b/tex/context/base/mkiv/node-dir.lua
diff --git a/tex/context/base/node-ext.lua b/tex/context/base/mkiv/node-ext.lua
index 82ec04ee5..82ec04ee5 100644
--- a/tex/context/base/node-ext.lua
+++ b/tex/context/base/mkiv/node-ext.lua
diff --git a/tex/context/base/node-fin.lua b/tex/context/base/mkiv/node-fin.lua
index 313b804cb..313b804cb 100644
--- a/tex/context/base/node-fin.lua
+++ b/tex/context/base/mkiv/node-fin.lua
diff --git a/tex/context/base/node-fin.mkiv b/tex/context/base/mkiv/node-fin.mkiv
index 413a00722..413a00722 100644
--- a/tex/context/base/node-fin.mkiv
+++ b/tex/context/base/mkiv/node-fin.mkiv
diff --git a/tex/context/base/node-fnt.lua b/tex/context/base/mkiv/node-fnt.lua
index 5e6d8f3d3..5e6d8f3d3 100644
--- a/tex/context/base/node-fnt.lua
+++ b/tex/context/base/mkiv/node-fnt.lua
diff --git a/tex/context/base/node-ini.lua b/tex/context/base/mkiv/node-ini.lua
index aac3b3284..aac3b3284 100644
--- a/tex/context/base/node-ini.lua
+++ b/tex/context/base/mkiv/node-ini.lua
diff --git a/tex/context/base/node-ini.mkiv b/tex/context/base/mkiv/node-ini.mkiv
index d04e647de..d04e647de 100644
--- a/tex/context/base/node-ini.mkiv
+++ b/tex/context/base/mkiv/node-ini.mkiv
diff --git a/tex/context/base/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua
index fe7261aa2..fe7261aa2 100644
--- a/tex/context/base/node-ltp.lua
+++ b/tex/context/base/mkiv/node-ltp.lua
diff --git a/tex/context/base/node-met.lua b/tex/context/base/mkiv/node-met.lua
index 5c6e18bd3..5c6e18bd3 100644
--- a/tex/context/base/node-met.lua
+++ b/tex/context/base/mkiv/node-met.lua
diff --git a/tex/context/base/node-mig.lua b/tex/context/base/mkiv/node-mig.lua
index 24bebb0cc..24bebb0cc 100644
--- a/tex/context/base/node-mig.lua
+++ b/tex/context/base/mkiv/node-mig.lua
diff --git a/tex/context/base/node-mig.mkiv b/tex/context/base/mkiv/node-mig.mkiv
index 143fd4466..143fd4466 100644
--- a/tex/context/base/node-mig.mkiv
+++ b/tex/context/base/mkiv/node-mig.mkiv
diff --git a/tex/context/base/node-nut.lua b/tex/context/base/mkiv/node-nut.lua
index d82a21443..d82a21443 100644
--- a/tex/context/base/node-nut.lua
+++ b/tex/context/base/mkiv/node-nut.lua
diff --git a/tex/context/base/node-pag.lua b/tex/context/base/mkiv/node-pag.lua
index 9b8202042..9b8202042 100644
--- a/tex/context/base/node-pag.lua
+++ b/tex/context/base/mkiv/node-pag.lua
diff --git a/tex/context/base/node-pag.mkiv b/tex/context/base/mkiv/node-pag.mkiv
index b8ed197fe..b8ed197fe 100644
--- a/tex/context/base/node-pag.mkiv
+++ b/tex/context/base/mkiv/node-pag.mkiv
diff --git a/tex/context/base/node-ppt.lua b/tex/context/base/mkiv/node-ppt.lua
index 2573e5f5c..2573e5f5c 100644
--- a/tex/context/base/node-ppt.lua
+++ b/tex/context/base/mkiv/node-ppt.lua
diff --git a/tex/context/base/node-pro.lua b/tex/context/base/mkiv/node-pro.lua
index c7f68cf16..c7f68cf16 100644
--- a/tex/context/base/node-pro.lua
+++ b/tex/context/base/mkiv/node-pro.lua
diff --git a/tex/context/base/node-ref.lua b/tex/context/base/mkiv/node-ref.lua
index c6316917d..c6316917d 100644
--- a/tex/context/base/node-ref.lua
+++ b/tex/context/base/mkiv/node-ref.lua
diff --git a/tex/context/base/node-res.lua b/tex/context/base/mkiv/node-res.lua
index 892cd62f2..892cd62f2 100644
--- a/tex/context/base/node-res.lua
+++ b/tex/context/base/mkiv/node-res.lua
diff --git a/tex/context/base/node-rul.lua b/tex/context/base/mkiv/node-rul.lua
index d341bbd53..d341bbd53 100644
--- a/tex/context/base/node-rul.lua
+++ b/tex/context/base/mkiv/node-rul.lua
diff --git a/tex/context/base/node-rul.mkiv b/tex/context/base/mkiv/node-rul.mkiv
index 87277337e..87277337e 100644
--- a/tex/context/base/node-rul.mkiv
+++ b/tex/context/base/mkiv/node-rul.mkiv
diff --git a/tex/context/base/node-ser.lua b/tex/context/base/mkiv/node-ser.lua
index 99d26b63b..99d26b63b 100644
--- a/tex/context/base/node-ser.lua
+++ b/tex/context/base/mkiv/node-ser.lua
diff --git a/tex/context/base/node-shp.lua b/tex/context/base/mkiv/node-shp.lua
index 19b99b12c..19b99b12c 100644
--- a/tex/context/base/node-shp.lua
+++ b/tex/context/base/mkiv/node-shp.lua
diff --git a/tex/context/base/node-snp.lua b/tex/context/base/mkiv/node-snp.lua
index 31c7771ac..31c7771ac 100644
--- a/tex/context/base/node-snp.lua
+++ b/tex/context/base/mkiv/node-snp.lua
diff --git a/tex/context/base/node-tex.lua b/tex/context/base/mkiv/node-tex.lua
index c9d3091df..c9d3091df 100644
--- a/tex/context/base/node-tex.lua
+++ b/tex/context/base/mkiv/node-tex.lua
diff --git a/tex/context/base/node-tra.lua b/tex/context/base/mkiv/node-tra.lua
index e68228fe8..e68228fe8 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/mkiv/node-tra.lua
diff --git a/tex/context/base/node-tsk.lua b/tex/context/base/mkiv/node-tsk.lua
index 56a4b18ef..56a4b18ef 100644
--- a/tex/context/base/node-tsk.lua
+++ b/tex/context/base/mkiv/node-tsk.lua
diff --git a/tex/context/base/node-tst.lua b/tex/context/base/mkiv/node-tst.lua
index 4832c048c..4832c048c 100644
--- a/tex/context/base/node-tst.lua
+++ b/tex/context/base/mkiv/node-tst.lua
diff --git a/tex/context/base/node-typ.lua b/tex/context/base/mkiv/node-typ.lua
index 2d84e07a3..2d84e07a3 100644
--- a/tex/context/base/node-typ.lua
+++ b/tex/context/base/mkiv/node-typ.lua
diff --git a/tex/context/base/norm-ctx.mkiv b/tex/context/base/mkiv/norm-ctx.mkiv
index 6fc012c45..6fc012c45 100644
--- a/tex/context/base/norm-ctx.mkiv
+++ b/tex/context/base/mkiv/norm-ctx.mkiv
diff --git a/tex/context/base/pack-bar.mkiv b/tex/context/base/mkiv/pack-bar.mkiv
index 06eeebd14..06eeebd14 100644
--- a/tex/context/base/pack-bar.mkiv
+++ b/tex/context/base/mkiv/pack-bar.mkiv
diff --git a/tex/context/base/pack-bck.mkvi b/tex/context/base/mkiv/pack-bck.mkvi
index 430339f6d..430339f6d 100644
--- a/tex/context/base/pack-bck.mkvi
+++ b/tex/context/base/mkiv/pack-bck.mkvi
diff --git a/tex/context/base/pack-box.mkiv b/tex/context/base/mkiv/pack-box.mkiv
index fad7d6e18..fad7d6e18 100644
--- a/tex/context/base/pack-box.mkiv
+++ b/tex/context/base/mkiv/pack-box.mkiv
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/mkiv/pack-com.mkiv
index 623d669e7..623d669e7 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/mkiv/pack-com.mkiv
diff --git a/tex/context/base/pack-cut.mkiv b/tex/context/base/mkiv/pack-cut.mkiv
index ffd0251d5..ffd0251d5 100644
--- a/tex/context/base/pack-cut.mkiv
+++ b/tex/context/base/mkiv/pack-cut.mkiv
diff --git a/tex/context/base/pack-fen.mkiv b/tex/context/base/mkiv/pack-fen.mkiv
index 7bc821144..7bc821144 100644
--- a/tex/context/base/pack-fen.mkiv
+++ b/tex/context/base/mkiv/pack-fen.mkiv
diff --git a/tex/context/base/pack-lyr.mkiv b/tex/context/base/mkiv/pack-lyr.mkiv
index 61ed1e64b..61ed1e64b 100644
--- a/tex/context/base/pack-lyr.mkiv
+++ b/tex/context/base/mkiv/pack-lyr.mkiv
diff --git a/tex/context/base/pack-mis.mkvi b/tex/context/base/mkiv/pack-mis.mkvi
index 420f9440a..420f9440a 100644
--- a/tex/context/base/pack-mis.mkvi
+++ b/tex/context/base/mkiv/pack-mis.mkvi
diff --git a/tex/context/base/pack-mrl.mkiv b/tex/context/base/mkiv/pack-mrl.mkiv
index e8f89da8e..e8f89da8e 100644
--- a/tex/context/base/pack-mrl.mkiv
+++ b/tex/context/base/mkiv/pack-mrl.mkiv
diff --git a/tex/context/base/pack-obj.lua b/tex/context/base/mkiv/pack-obj.lua
index 342ca32bd..e056cb85a 100644
--- a/tex/context/base/pack-obj.lua
+++ b/tex/context/base/mkiv/pack-obj.lua
@@ -206,6 +206,7 @@ implement {
     arguments = { "string", "string" },
     actions   = function(ns,id)
         ctx_doifelse(data[ns][id])
+--         ctx_doifelse(objects.reference(ns,id))
     end,
 }
 
diff --git a/tex/context/base/pack-obj.mkiv b/tex/context/base/mkiv/pack-obj.mkiv
index cc78b3ab7..6a73d1387 100644
--- a/tex/context/base/pack-obj.mkiv
+++ b/tex/context/base/mkiv/pack-obj.mkiv
@@ -53,6 +53,8 @@
 
 % If I have time I will use the unreferenced variant for e.g. mp reuse.
 
+% todo formmargin per obj
+
 \unexpanded\def\setreferencedobject       #1#2{\begingroup\objectoff\objectoffset\inobjecttrue\dowithnextbox{\pack_objects_set_yes{#1}{#2}}}
 \unexpanded\def\settightreferencedobject  #1#2{\begingroup\objectoff\zeropoint   \inobjecttrue\dowithnextbox{\pack_objects_set_yes{#1}{#2}}}
 \unexpanded\def\setunreferencedobject     #1#2{\begingroup\objectoff\objectoffset\inobjecttrue\dowithnextbox{\pack_objects_set_nop{#1}{#2}}}
@@ -139,13 +141,16 @@
 \unexpanded\def\dogetobjectreference        {\clf_getobjectreference}
 \unexpanded\def\dogetobjectreferencepage    {\clf_getobjectreferencepage}
 
-\unexpanded\def\doifobjectfoundelse         {\clf_doifelseobject}
-\unexpanded\def\doifobjectreferencefoundelse{\clf_doifelseobject}
 \unexpanded\def\doifelseobjectfound         {\clf_doifelseobject}
 \unexpanded\def\doifelseobjectreferencefound{\clf_doifelseobject}
 
+\let\doifobjectfoundelse         \doifelseobjectfound
+\let\doifobjectreferencefoundelse\doifelseobjectreferencefound
+
 %D For the moment here:
 
+\let\lastpredefinedsymbol\empty % some day we can do more at the lua end
+
 \unexpanded\def\predefinesymbol[#1]%
   {\begingroup
    \xdef\lastpredefinedsymbol{#1}%
diff --git a/tex/context/base/pack-pos.mkiv b/tex/context/base/mkiv/pack-pos.mkiv
index c52c01ca4..c52c01ca4 100644
--- a/tex/context/base/pack-pos.mkiv
+++ b/tex/context/base/mkiv/pack-pos.mkiv
diff --git a/tex/context/base/pack-rul.lua b/tex/context/base/mkiv/pack-rul.lua
index 32cd9738e..32cd9738e 100644
--- a/tex/context/base/pack-rul.lua
+++ b/tex/context/base/mkiv/pack-rul.lua
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/mkiv/pack-rul.mkiv
index b858a8e6e..4484d7587 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/mkiv/pack-rul.mkiv
@@ -507,12 +507,19 @@
 %D \macros
 %D   {overlayfakebox}
 
+% \unexpanded\def\overlayfakebox
+%   {\hpack
+%      {\setbox\scratchbox\emptyhbox
+%       \wd\scratchbox\d_overlay_width
+%       \ht\scratchbox\d_overlay_height
+%       \box\scratchbox}}
+
 \unexpanded\def\overlayfakebox
-  {\hpack
-     {\setbox\scratchbox\emptyhbox
-      \wd\scratchbox\d_overlay_width
-      \ht\scratchbox\d_overlay_height
-      \box\scratchbox}}
+  {\hpack % redundant but needs testing
+     {\novrule
+        \s!width \d_overlay_width
+        \s!height\d_overlay_height
+        \s!depth \zeropoint}}
 
 %D For testing we provide:
 
@@ -691,16 +698,19 @@
       \box\b_framed_extra}}
 
 \def\pack_framed_stroked_box_normal
-  {\setbox\scratchbox\emptyhbox
-   \wd\scratchbox\d_framed_target_wd
-   \ht\scratchbox\d_framed_target_ht
-   \dp\scratchbox\d_framed_target_dp
+  {%\setbox\scratchbox\emptyhbox
+   %\wd\scratchbox\d_framed_target_wd
+   %\ht\scratchbox\d_framed_target_ht
+   %\dp\scratchbox\d_framed_target_dp
    \setbox\scratchbox\vpack \bgroup
      \csname   \??framedtop\p_framed_frame\framedparameter\c!topframe   \endcsname
      \nointerlineskip % new (needed for fences)
      \hbox \bgroup
        \csname \??framedleft\p_framed_frame\framedparameter\c!leftframe  \endcsname
-       \box\scratchbox
+       \novrule
+         \s!width \d_framed_target_wd
+         \s!height\d_framed_target_ht
+         \s!depth \d_framed_target_dp
        \csname \??framedright\p_framed_frame\framedparameter\c!rightframe \endcsname
      \egroup
      \nointerlineskip % new (needed for fences)
diff --git a/tex/context/base/page-app.mkiv b/tex/context/base/mkiv/page-app.mkiv
index cdb964ab0..cdb964ab0 100644
--- a/tex/context/base/page-app.mkiv
+++ b/tex/context/base/mkiv/page-app.mkiv
diff --git a/tex/context/base/page-bck.mkiv b/tex/context/base/mkiv/page-bck.mkiv
index b44910bbe..b44910bbe 100644
--- a/tex/context/base/page-bck.mkiv
+++ b/tex/context/base/mkiv/page-bck.mkiv
diff --git a/tex/context/base/page-box.mkvi b/tex/context/base/mkiv/page-box.mkvi
index fa85aef68..fa85aef68 100644
--- a/tex/context/base/page-box.mkvi
+++ b/tex/context/base/mkiv/page-box.mkvi
diff --git a/tex/context/base/page-brk.mkiv b/tex/context/base/mkiv/page-brk.mkiv
index 914553253..914553253 100644
--- a/tex/context/base/page-brk.mkiv
+++ b/tex/context/base/mkiv/page-brk.mkiv
diff --git a/tex/context/base/page-col.mkiv b/tex/context/base/mkiv/page-col.mkiv
index 14b512421..14b512421 100644
--- a/tex/context/base/page-col.mkiv
+++ b/tex/context/base/mkiv/page-col.mkiv
diff --git a/tex/context/base/page-com.mkiv b/tex/context/base/mkiv/page-com.mkiv
index b051b3db9..b051b3db9 100644
--- a/tex/context/base/page-com.mkiv
+++ b/tex/context/base/mkiv/page-com.mkiv
diff --git a/tex/context/base/page-fac.mkiv b/tex/context/base/mkiv/page-fac.mkiv
index 88789abe9..88789abe9 100644
--- a/tex/context/base/page-fac.mkiv
+++ b/tex/context/base/mkiv/page-fac.mkiv
diff --git a/tex/context/base/page-flt.lua b/tex/context/base/mkiv/page-flt.lua
index 9cc9012a2..9cc9012a2 100644
--- a/tex/context/base/page-flt.lua
+++ b/tex/context/base/mkiv/page-flt.lua
diff --git a/tex/context/base/page-flt.mkiv b/tex/context/base/mkiv/page-flt.mkiv
index c514496df..c514496df 100644
--- a/tex/context/base/page-flt.mkiv
+++ b/tex/context/base/mkiv/page-flt.mkiv
diff --git a/tex/context/base/page-flw.mkiv b/tex/context/base/mkiv/page-flw.mkiv
index 56fe32e5b..56fe32e5b 100644
--- a/tex/context/base/page-flw.mkiv
+++ b/tex/context/base/mkiv/page-flw.mkiv
diff --git a/tex/context/base/page-grd.mkiv b/tex/context/base/mkiv/page-grd.mkiv
index 546bd4d89..546bd4d89 100644
--- a/tex/context/base/page-grd.mkiv
+++ b/tex/context/base/mkiv/page-grd.mkiv
diff --git a/tex/context/base/page-imp.mkiv b/tex/context/base/mkiv/page-imp.mkiv
index 2382d131a..2382d131a 100644
--- a/tex/context/base/page-imp.mkiv
+++ b/tex/context/base/mkiv/page-imp.mkiv
diff --git a/tex/context/base/page-inf.mkiv b/tex/context/base/mkiv/page-inf.mkiv
index f60977e0c..f60977e0c 100644
--- a/tex/context/base/page-inf.mkiv
+++ b/tex/context/base/mkiv/page-inf.mkiv
diff --git a/tex/context/base/page-ini.mkiv b/tex/context/base/mkiv/page-ini.mkiv
index 6f6cb7180..6f6cb7180 100644
--- a/tex/context/base/page-ini.mkiv
+++ b/tex/context/base/mkiv/page-ini.mkiv
diff --git a/tex/context/base/page-inj.lua b/tex/context/base/mkiv/page-inj.lua
index fd66ead08..fd66ead08 100644
--- a/tex/context/base/page-inj.lua
+++ b/tex/context/base/mkiv/page-inj.lua
diff --git a/tex/context/base/page-inj.mkvi b/tex/context/base/mkiv/page-inj.mkvi
index 03472fe55..03472fe55 100644
--- a/tex/context/base/page-inj.mkvi
+++ b/tex/context/base/mkiv/page-inj.mkvi
diff --git a/tex/context/base/page-ins.lua b/tex/context/base/mkiv/page-ins.lua
index 235f586c6..235f586c6 100644
--- a/tex/context/base/page-ins.lua
+++ b/tex/context/base/mkiv/page-ins.lua
diff --git a/tex/context/base/page-ins.mkiv b/tex/context/base/mkiv/page-ins.mkiv
index c91073a14..c91073a14 100644
--- a/tex/context/base/page-ins.mkiv
+++ b/tex/context/base/mkiv/page-ins.mkiv
diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/mkiv/page-lay.mkiv
index f1aec4e3d..f1aec4e3d 100644
--- a/tex/context/base/page-lay.mkiv
+++ b/tex/context/base/mkiv/page-lay.mkiv
diff --git a/tex/context/base/page-lin.lua b/tex/context/base/mkiv/page-lin.lua
index 1124d80f9..1124d80f9 100644
--- a/tex/context/base/page-lin.lua
+++ b/tex/context/base/mkiv/page-lin.lua
diff --git a/tex/context/base/page-lin.mkvi b/tex/context/base/mkiv/page-lin.mkvi
index 290984779..290984779 100644
--- a/tex/context/base/page-lin.mkvi
+++ b/tex/context/base/mkiv/page-lin.mkvi
diff --git a/tex/context/base/page-mak.mkvi b/tex/context/base/mkiv/page-mak.mkvi
index 04df90d08..04df90d08 100644
--- a/tex/context/base/page-mak.mkvi
+++ b/tex/context/base/mkiv/page-mak.mkvi
diff --git a/tex/context/base/page-mbk.mkvi b/tex/context/base/mkiv/page-mbk.mkvi
index 8038771d9..8038771d9 100644
--- a/tex/context/base/page-mbk.mkvi
+++ b/tex/context/base/mkiv/page-mbk.mkvi
diff --git a/tex/context/base/page-mix.lua b/tex/context/base/mkiv/page-mix.lua
index c844bd32d..c844bd32d 100644
--- a/tex/context/base/page-mix.lua
+++ b/tex/context/base/mkiv/page-mix.lua
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/mkiv/page-mix.mkiv
index db98df4a8..db98df4a8 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/mkiv/page-mix.mkiv
diff --git a/tex/context/base/page-mrk.mkiv b/tex/context/base/mkiv/page-mrk.mkiv
index 0cd615f8a..0cd615f8a 100644
--- a/tex/context/base/page-mrk.mkiv
+++ b/tex/context/base/mkiv/page-mrk.mkiv
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv
index 631232368..631232368 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/mkiv/page-mul.mkiv
diff --git a/tex/context/base/page-not.mkiv b/tex/context/base/mkiv/page-not.mkiv
index d7602bd26..d7602bd26 100644
--- a/tex/context/base/page-not.mkiv
+++ b/tex/context/base/mkiv/page-not.mkiv
diff --git a/tex/context/base/page-one.mkiv b/tex/context/base/mkiv/page-one.mkiv
index a41787133..a41787133 100644
--- a/tex/context/base/page-one.mkiv
+++ b/tex/context/base/mkiv/page-one.mkiv
diff --git a/tex/context/base/page-otr.lua b/tex/context/base/mkiv/page-otr.lua
index 307158684..307158684 100644
--- a/tex/context/base/page-otr.lua
+++ b/tex/context/base/mkiv/page-otr.lua
diff --git a/tex/context/base/page-otr.mkvi b/tex/context/base/mkiv/page-otr.mkvi
index 1249498f5..ec38a06c1 100644
--- a/tex/context/base/page-otr.mkvi
+++ b/tex/context/base/mkiv/page-otr.mkvi
@@ -51,32 +51,32 @@
     \let\page_otr_commands_process\gobbleoneargument
 \to \everyswitchoutputroutine
 
-\unexpanded\def\page_otr_specifics_preset#1%
-  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#1}}% no inheritance of commands
+\unexpanded\def\page_otr_specifics_preset#name%
+  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#name}}% no inheritance of commands
    \ifx\page_otr_specifics_command\empty
-     \writestatus{\currentoutputroutine}{- \expandafter\strippedcsname\csname#1\endcsname}%
-     \expandafter\let\csname#1\endcsname\relax
+     \writestatus{\currentoutputroutine}{- \expandafter\strippedcsname\csname#name\endcsname}%
+     \expandafter\let\csname#name\endcsname\relax
    \else
-     \writestatus{\currentoutputroutine}{+ \expandafter\strippedcsname\csname#1\endcsname}%
-     \expandafter\let\csname#1\expandafter\endcsname\page_otr_specifics_command
+     \writestatus{\currentoutputroutine}{+ \expandafter\strippedcsname\csname#name\endcsname}%
+     \expandafter\let\csname#name\expandafter\endcsname\page_otr_specifics_command
    \fi}
 
-\unexpanded\def\page_otr_specifics_preset_normal#1%
-  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#1}}% no inheritance of commands
+\unexpanded\def\page_otr_specifics_preset_normal#name%
+  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#name}}% no inheritance of commands
    \ifx\page_otr_specifics_command\empty
-     \expandafter\let\csname#1\endcsname\relax
+     \expandafter\let\csname#name\endcsname\relax
    \else
-     \expandafter\let\csname#1\expandafter\endcsname\page_otr_specifics_command
+     \expandafter\let\csname#name\expandafter\endcsname\page_otr_specifics_command
    \fi}
 
-\unexpanded\def\page_otr_specifics_preset_traced#1%
-  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#1}}% no inheritance of commands
+\unexpanded\def\page_otr_specifics_preset_traced#name%
+  {\edef\page_otr_specifics_command{\strictoutputroutineparameter{#name}}% no inheritance of commands
    \ifx\page_otr_specifics_command\empty
-     \writestatus{\currentoutputroutine}{preset: - \expandafter\strippedcsname\csname#1\endcsname}%
-     \expandafter\let\csname#1\endcsname\relax
+     \writestatus{\currentoutputroutine}{preset: - \expandafter\strippedcsname\csname#name\endcsname}%
+     \expandafter\let\csname#name\endcsname\relax
    \else
-     \writestatus{\currentoutputroutine}{preset: + \expandafter\strippedcsname\csname#1\endcsname}%
-     \expandafter\let\csname#1\expandafter\endcsname\page_otr_specifics_command
+     \writestatus{\currentoutputroutine}{preset: + \expandafter\strippedcsname\csname#name\endcsname}%
+     \expandafter\let\csname#name\expandafter\endcsname\page_otr_specifics_command
    \fi}
 
 \let\page_otr_specifics_preset\page_otr_specifics_preset_normal
@@ -104,11 +104,11 @@
 \unexpanded\def\page_otr_message_b{\page_otr_message_s+}
 \unexpanded\def\page_otr_message_e{\page_otr_message_s-}
 
-\unexpanded\def\page_otr_message_s#1#2%
+\unexpanded\def\page_otr_message_s#sign#what%
   {\writestatus
     \currentoutputroutine
-    {#1\space             \space
-     #2\space             \space
+    {#sign\space          \space
+     #what\space          \space
      p:\the\outputpenalty,\space
      r:\the\realpageno   ,\space
      c:\number\mofcolumns,\space
@@ -119,16 +119,16 @@
        d:\the\dimexpr\pagetotal-\pagegoal\relax
      \fi}}
 
-\unexpanded\def\page_otr_trigger#1%
+\unexpanded\def\page_otr_trigger#penalty%
   {\begingroup
    \par
-   \penalty#1%
+   \penalty#penalty%
    \endgroup}
 
-\unexpanded\def\installoutputroutine#1#2% \invoke \action
+\unexpanded\def\installoutputroutine#invoke#action% \invoke \action
   {\global\advance\c_page_otf_trigger_penalty\minusone
-   \edef#1{\page_otr_trigger{\number\c_page_otf_trigger_penalty}}%
-   \setvalue{\??otrtriggers\number\c_page_otf_trigger_penalty}{#2}}
+   \edef#invoke{\page_otr_trigger{\number\c_page_otf_trigger_penalty}}%
+   \setvalue{\??otrtriggers\number\c_page_otf_trigger_penalty}{#action}}
 
 \unexpanded\def\page_otr_triggered_output_routine_traced
   {\ifcsname\??otrtriggers\the\outputpenalty\endcsname
@@ -159,11 +159,11 @@
 \ifdefined\everybeforeoutput \else \newtoks\everybeforeoutput \fi
 \ifdefined\everyafteroutput  \else \newtoks\everyafteroutput  \fi
 
-\def\page_otf_set_engine_output_routine#1%
+\def\page_otf_set_engine_output_routine#content%
   {\global\output
      {\inotrtrue
       \the\everybeforeoutput
-      #1\relax
+      #content\relax
       \the\everyafteroutput}}
 
 \page_otf_set_engine_output_routine\page_otr_triggered_output_routine
diff --git a/tex/context/base/page-par.mkiv b/tex/context/base/mkiv/page-par.mkiv
index 588065d65..588065d65 100644
--- a/tex/context/base/page-par.mkiv
+++ b/tex/context/base/mkiv/page-par.mkiv
diff --git a/tex/context/base/page-plg.mkiv b/tex/context/base/mkiv/page-plg.mkiv
index b59a05a94..b59a05a94 100644
--- a/tex/context/base/page-plg.mkiv
+++ b/tex/context/base/mkiv/page-plg.mkiv
diff --git a/tex/context/base/page-pst.lua b/tex/context/base/mkiv/page-pst.lua
index 472bdbabe..472bdbabe 100644
--- a/tex/context/base/page-pst.lua
+++ b/tex/context/base/mkiv/page-pst.lua
diff --git a/tex/context/base/page-pst.mkiv b/tex/context/base/mkiv/page-pst.mkiv
index f12663f66..f12663f66 100644
--- a/tex/context/base/page-pst.mkiv
+++ b/tex/context/base/mkiv/page-pst.mkiv
diff --git a/tex/context/base/page-run.mkiv b/tex/context/base/mkiv/page-run.mkiv
index 9adcb23c7..9adcb23c7 100644
--- a/tex/context/base/page-run.mkiv
+++ b/tex/context/base/mkiv/page-run.mkiv
diff --git a/tex/context/base/page-sel.mkvi b/tex/context/base/mkiv/page-sel.mkvi
index 93521d4e6..93521d4e6 100644
--- a/tex/context/base/page-sel.mkvi
+++ b/tex/context/base/mkiv/page-sel.mkvi
diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/mkiv/page-set.mkiv
index 98548b3aa..98548b3aa 100644
--- a/tex/context/base/page-set.mkiv
+++ b/tex/context/base/mkiv/page-set.mkiv
diff --git a/tex/context/base/page-sid.mkiv b/tex/context/base/mkiv/page-sid.mkiv
index 2c1c624df..2c1c624df 100644
--- a/tex/context/base/page-sid.mkiv
+++ b/tex/context/base/mkiv/page-sid.mkiv
diff --git a/tex/context/base/page-spr.mkiv b/tex/context/base/mkiv/page-spr.mkiv
index dc1e013d5..dc1e013d5 100644
--- a/tex/context/base/page-spr.mkiv
+++ b/tex/context/base/mkiv/page-spr.mkiv
diff --git a/tex/context/base/page-str.lua b/tex/context/base/mkiv/page-str.lua
index 56c6167aa..56c6167aa 100644
--- a/tex/context/base/page-str.lua
+++ b/tex/context/base/mkiv/page-str.lua
diff --git a/tex/context/base/page-str.mkiv b/tex/context/base/mkiv/page-str.mkiv
index e4b2fa229..e4b2fa229 100644
--- a/tex/context/base/page-str.mkiv
+++ b/tex/context/base/mkiv/page-str.mkiv
diff --git a/tex/context/base/page-txt.mkvi b/tex/context/base/mkiv/page-txt.mkvi
index ed1104312..ed1104312 100644
--- a/tex/context/base/page-txt.mkvi
+++ b/tex/context/base/mkiv/page-txt.mkvi
diff --git a/tex/context/base/page-var.mkiv b/tex/context/base/mkiv/page-var.mkiv
index 1c7fd5b25..1c7fd5b25 100644
--- a/tex/context/base/page-var.mkiv
+++ b/tex/context/base/mkiv/page-var.mkiv
diff --git a/tex/context/base/phys-dim.lua b/tex/context/base/mkiv/phys-dim.lua
index 71c9b0bd4..71c9b0bd4 100644
--- a/tex/context/base/phys-dim.lua
+++ b/tex/context/base/mkiv/phys-dim.lua
diff --git a/tex/context/base/phys-dim.mkiv b/tex/context/base/mkiv/phys-dim.mkiv
index fcbb53311..fcbb53311 100644
--- a/tex/context/base/phys-dim.mkiv
+++ b/tex/context/base/mkiv/phys-dim.mkiv
diff --git a/tex/context/base/prop-ini.mkiv b/tex/context/base/mkiv/prop-ini.mkiv
index 3b1c59b24..3b1c59b24 100644
--- a/tex/context/base/prop-ini.mkiv
+++ b/tex/context/base/mkiv/prop-ini.mkiv
diff --git a/tex/context/base/publ-aut.lua b/tex/context/base/mkiv/publ-aut.lua
index 5ed25f288..5ed25f288 100644
--- a/tex/context/base/publ-aut.lua
+++ b/tex/context/base/mkiv/publ-aut.lua
diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/mkiv/publ-dat.lua
index b9c43ac44..b9c43ac44 100644
--- a/tex/context/base/publ-dat.lua
+++ b/tex/context/base/mkiv/publ-dat.lua
diff --git a/tex/context/base/publ-fnd.lua b/tex/context/base/mkiv/publ-fnd.lua
index 32d0c11be..32d0c11be 100644
--- a/tex/context/base/publ-fnd.lua
+++ b/tex/context/base/mkiv/publ-fnd.lua
diff --git a/tex/context/base/publ-imp-apa.lua b/tex/context/base/mkiv/publ-imp-apa.lua
index c6fe248ce..c6fe248ce 100644
--- a/tex/context/base/publ-imp-apa.lua
+++ b/tex/context/base/mkiv/publ-imp-apa.lua
diff --git a/tex/context/base/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi
index 1411042c9..1411042c9 100644
--- a/tex/context/base/publ-imp-apa.mkvi
+++ b/tex/context/base/mkiv/publ-imp-apa.mkvi
diff --git a/tex/context/base/publ-imp-aps.lua b/tex/context/base/mkiv/publ-imp-aps.lua
index c15ffe918..c15ffe918 100644
--- a/tex/context/base/publ-imp-aps.lua
+++ b/tex/context/base/mkiv/publ-imp-aps.lua
diff --git a/tex/context/base/publ-imp-aps.mkvi b/tex/context/base/mkiv/publ-imp-aps.mkvi
index 674245714..674245714 100644
--- a/tex/context/base/publ-imp-aps.mkvi
+++ b/tex/context/base/mkiv/publ-imp-aps.mkvi
diff --git a/tex/context/base/publ-imp-author.mkvi b/tex/context/base/mkiv/publ-imp-author.mkvi
index b52433186..b52433186 100644
--- a/tex/context/base/publ-imp-author.mkvi
+++ b/tex/context/base/mkiv/publ-imp-author.mkvi
diff --git a/tex/context/base/publ-imp-cite.mkvi b/tex/context/base/mkiv/publ-imp-cite.mkvi
index cb1c46fe4..cb1c46fe4 100644
--- a/tex/context/base/publ-imp-cite.mkvi
+++ b/tex/context/base/mkiv/publ-imp-cite.mkvi
diff --git a/tex/context/base/publ-imp-commands.mkvi b/tex/context/base/mkiv/publ-imp-commands.mkvi
index 14e2dbae1..14e2dbae1 100644
--- a/tex/context/base/publ-imp-commands.mkvi
+++ b/tex/context/base/mkiv/publ-imp-commands.mkvi
diff --git a/tex/context/base/publ-imp-default.lua b/tex/context/base/mkiv/publ-imp-default.lua
index 61b08f30c..61b08f30c 100644
--- a/tex/context/base/publ-imp-default.lua
+++ b/tex/context/base/mkiv/publ-imp-default.lua
diff --git a/tex/context/base/publ-imp-default.mkvi b/tex/context/base/mkiv/publ-imp-default.mkvi
index f5c99ac18..f5c99ac18 100644
--- a/tex/context/base/publ-imp-default.mkvi
+++ b/tex/context/base/mkiv/publ-imp-default.mkvi
diff --git a/tex/context/base/publ-imp-definitions.mkvi b/tex/context/base/mkiv/publ-imp-definitions.mkvi
index 295586f60..295586f60 100644
--- a/tex/context/base/publ-imp-definitions.mkvi
+++ b/tex/context/base/mkiv/publ-imp-definitions.mkvi
diff --git a/tex/context/base/publ-imp-list.mkvi b/tex/context/base/mkiv/publ-imp-list.mkvi
index 68ccaef01..68ccaef01 100644
--- a/tex/context/base/publ-imp-list.mkvi
+++ b/tex/context/base/mkiv/publ-imp-list.mkvi
diff --git a/tex/context/base/publ-imp-page.mkvi b/tex/context/base/mkiv/publ-imp-page.mkvi
index 2d9040b10..2d9040b10 100644
--- a/tex/context/base/publ-imp-page.mkvi
+++ b/tex/context/base/mkiv/publ-imp-page.mkvi
diff --git a/tex/context/base/publ-imp-replacements.lua b/tex/context/base/mkiv/publ-imp-replacements.lua
index e0ac249fc..e0ac249fc 100644
--- a/tex/context/base/publ-imp-replacements.lua
+++ b/tex/context/base/mkiv/publ-imp-replacements.lua
diff --git a/tex/context/base/publ-imp-test.bib b/tex/context/base/mkiv/publ-imp-test.bib
index 0d81b49ff..0d81b49ff 100644
--- a/tex/context/base/publ-imp-test.bib
+++ b/tex/context/base/mkiv/publ-imp-test.bib
diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua
index c30f780f1..c30f780f1 100644
--- a/tex/context/base/publ-ini.lua
+++ b/tex/context/base/mkiv/publ-ini.lua
diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index 782f73e0c..782f73e0c 100644
--- a/tex/context/base/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
diff --git a/tex/context/base/publ-jrn.lua b/tex/context/base/mkiv/publ-jrn.lua
index 0cc41862f..0cc41862f 100644
--- a/tex/context/base/publ-jrn.lua
+++ b/tex/context/base/mkiv/publ-jrn.lua
diff --git a/tex/context/base/publ-old.mkiv b/tex/context/base/mkiv/publ-old.mkiv
index f616428e6..f616428e6 100644
--- a/tex/context/base/publ-old.mkiv
+++ b/tex/context/base/mkiv/publ-old.mkiv
diff --git a/tex/context/base/publ-oth.lua b/tex/context/base/mkiv/publ-oth.lua
index 55c62c31e..55c62c31e 100644
--- a/tex/context/base/publ-oth.lua
+++ b/tex/context/base/mkiv/publ-oth.lua
diff --git a/tex/context/base/publ-reg.lua b/tex/context/base/mkiv/publ-reg.lua
index 3f276b49a..3f276b49a 100644
--- a/tex/context/base/publ-reg.lua
+++ b/tex/context/base/mkiv/publ-reg.lua
diff --git a/tex/context/base/publ-sor.lua b/tex/context/base/mkiv/publ-sor.lua
index 218d11093..218d11093 100644
--- a/tex/context/base/publ-sor.lua
+++ b/tex/context/base/mkiv/publ-sor.lua
diff --git a/tex/context/base/publ-tra.lua b/tex/context/base/mkiv/publ-tra.lua
index 4b03307ac..4b03307ac 100644
--- a/tex/context/base/publ-tra.lua
+++ b/tex/context/base/mkiv/publ-tra.lua
diff --git a/tex/context/base/publ-tra.mkiv b/tex/context/base/mkiv/publ-tra.mkiv
index 6ef86ca59..6ef86ca59 100644
--- a/tex/context/base/publ-tra.mkiv
+++ b/tex/context/base/mkiv/publ-tra.mkiv
diff --git a/tex/context/base/publ-usr.lua b/tex/context/base/mkiv/publ-usr.lua
index 901f11629..901f11629 100644
--- a/tex/context/base/publ-usr.lua
+++ b/tex/context/base/mkiv/publ-usr.lua
diff --git a/tex/context/base/publ-usr.mkiv b/tex/context/base/mkiv/publ-usr.mkiv
index cb078f424..cb078f424 100644
--- a/tex/context/base/publ-usr.mkiv
+++ b/tex/context/base/mkiv/publ-usr.mkiv
diff --git a/tex/context/base/publ-xml.mkiv b/tex/context/base/mkiv/publ-xml.mkiv
index 96375b9cc..96375b9cc 100644
--- a/tex/context/base/publ-xml.mkiv
+++ b/tex/context/base/mkiv/publ-xml.mkiv
diff --git a/tex/context/base/regi-8859-1.lua b/tex/context/base/mkiv/regi-8859-1.lua
index ff2182afa..ff2182afa 100644
--- a/tex/context/base/regi-8859-1.lua
+++ b/tex/context/base/mkiv/regi-8859-1.lua
diff --git a/tex/context/base/regi-8859-10.lua b/tex/context/base/mkiv/regi-8859-10.lua
index f23744b4a..f23744b4a 100644
--- a/tex/context/base/regi-8859-10.lua
+++ b/tex/context/base/mkiv/regi-8859-10.lua
diff --git a/tex/context/base/regi-8859-11.lua b/tex/context/base/mkiv/regi-8859-11.lua
index 54e5626c2..54e5626c2 100644
--- a/tex/context/base/regi-8859-11.lua
+++ b/tex/context/base/mkiv/regi-8859-11.lua
diff --git a/tex/context/base/regi-8859-13.lua b/tex/context/base/mkiv/regi-8859-13.lua
index 1646133b5..1646133b5 100644
--- a/tex/context/base/regi-8859-13.lua
+++ b/tex/context/base/mkiv/regi-8859-13.lua
diff --git a/tex/context/base/regi-8859-14.lua b/tex/context/base/mkiv/regi-8859-14.lua
index 2b0c68814..2b0c68814 100644
--- a/tex/context/base/regi-8859-14.lua
+++ b/tex/context/base/mkiv/regi-8859-14.lua
diff --git a/tex/context/base/regi-8859-15.lua b/tex/context/base/mkiv/regi-8859-15.lua
index 48861f396..48861f396 100644
--- a/tex/context/base/regi-8859-15.lua
+++ b/tex/context/base/mkiv/regi-8859-15.lua
diff --git a/tex/context/base/regi-8859-16.lua b/tex/context/base/mkiv/regi-8859-16.lua
index e122a2042..e122a2042 100644
--- a/tex/context/base/regi-8859-16.lua
+++ b/tex/context/base/mkiv/regi-8859-16.lua
diff --git a/tex/context/base/regi-8859-2.lua b/tex/context/base/mkiv/regi-8859-2.lua
index affd6c3ca..affd6c3ca 100644
--- a/tex/context/base/regi-8859-2.lua
+++ b/tex/context/base/mkiv/regi-8859-2.lua
diff --git a/tex/context/base/regi-8859-3.lua b/tex/context/base/mkiv/regi-8859-3.lua
index 4b5c54b4f..4b5c54b4f 100644
--- a/tex/context/base/regi-8859-3.lua
+++ b/tex/context/base/mkiv/regi-8859-3.lua
diff --git a/tex/context/base/regi-8859-4.lua b/tex/context/base/mkiv/regi-8859-4.lua
index 774ec2e10..774ec2e10 100644
--- a/tex/context/base/regi-8859-4.lua
+++ b/tex/context/base/mkiv/regi-8859-4.lua
diff --git a/tex/context/base/regi-8859-5.lua b/tex/context/base/mkiv/regi-8859-5.lua
index 1137f37bb..1137f37bb 100644
--- a/tex/context/base/regi-8859-5.lua
+++ b/tex/context/base/mkiv/regi-8859-5.lua
diff --git a/tex/context/base/regi-8859-6.lua b/tex/context/base/mkiv/regi-8859-6.lua
index 651ae79ff..651ae79ff 100644
--- a/tex/context/base/regi-8859-6.lua
+++ b/tex/context/base/mkiv/regi-8859-6.lua
diff --git a/tex/context/base/regi-8859-7.lua b/tex/context/base/mkiv/regi-8859-7.lua
index 08cbbab6e..08cbbab6e 100644
--- a/tex/context/base/regi-8859-7.lua
+++ b/tex/context/base/mkiv/regi-8859-7.lua
diff --git a/tex/context/base/regi-8859-8.lua b/tex/context/base/mkiv/regi-8859-8.lua
index b69609991..b69609991 100644
--- a/tex/context/base/regi-8859-8.lua
+++ b/tex/context/base/mkiv/regi-8859-8.lua
diff --git a/tex/context/base/regi-8859-9.lua b/tex/context/base/mkiv/regi-8859-9.lua
index 773307fff..773307fff 100644
--- a/tex/context/base/regi-8859-9.lua
+++ b/tex/context/base/mkiv/regi-8859-9.lua
diff --git a/tex/context/base/regi-cp1250.lua b/tex/context/base/mkiv/regi-cp1250.lua
index 00d55d1b8..00d55d1b8 100644
--- a/tex/context/base/regi-cp1250.lua
+++ b/tex/context/base/mkiv/regi-cp1250.lua
diff --git a/tex/context/base/regi-cp1251.lua b/tex/context/base/mkiv/regi-cp1251.lua
index 7bb72e0cc..7bb72e0cc 100644
--- a/tex/context/base/regi-cp1251.lua
+++ b/tex/context/base/mkiv/regi-cp1251.lua
diff --git a/tex/context/base/regi-cp1252.lua b/tex/context/base/mkiv/regi-cp1252.lua
index 86954c9af..86954c9af 100644
--- a/tex/context/base/regi-cp1252.lua
+++ b/tex/context/base/mkiv/regi-cp1252.lua
diff --git a/tex/context/base/regi-cp1253.lua b/tex/context/base/mkiv/regi-cp1253.lua
index 31a411efe..31a411efe 100644
--- a/tex/context/base/regi-cp1253.lua
+++ b/tex/context/base/mkiv/regi-cp1253.lua
diff --git a/tex/context/base/regi-cp1254.lua b/tex/context/base/mkiv/regi-cp1254.lua
index 73b9927c6..73b9927c6 100644
--- a/tex/context/base/regi-cp1254.lua
+++ b/tex/context/base/mkiv/regi-cp1254.lua
diff --git a/tex/context/base/regi-cp1255.lua b/tex/context/base/mkiv/regi-cp1255.lua
index 2abb16b54..2abb16b54 100644
--- a/tex/context/base/regi-cp1255.lua
+++ b/tex/context/base/mkiv/regi-cp1255.lua
diff --git a/tex/context/base/regi-cp1256.lua b/tex/context/base/mkiv/regi-cp1256.lua
index a0697c321..a0697c321 100644
--- a/tex/context/base/regi-cp1256.lua
+++ b/tex/context/base/mkiv/regi-cp1256.lua
diff --git a/tex/context/base/regi-cp1257.lua b/tex/context/base/mkiv/regi-cp1257.lua
index 6e39c10d4..6e39c10d4 100644
--- a/tex/context/base/regi-cp1257.lua
+++ b/tex/context/base/mkiv/regi-cp1257.lua
diff --git a/tex/context/base/regi-cp1258.lua b/tex/context/base/mkiv/regi-cp1258.lua
index cf64d2ab6..cf64d2ab6 100644
--- a/tex/context/base/regi-cp1258.lua
+++ b/tex/context/base/mkiv/regi-cp1258.lua
diff --git a/tex/context/base/regi-demo.lua b/tex/context/base/mkiv/regi-demo.lua
index 689f44e32..689f44e32 100644
--- a/tex/context/base/regi-demo.lua
+++ b/tex/context/base/mkiv/regi-demo.lua
diff --git a/tex/context/base/regi-ini.lua b/tex/context/base/mkiv/regi-ini.lua
index 37a88fd5f..37a88fd5f 100644
--- a/tex/context/base/regi-ini.lua
+++ b/tex/context/base/mkiv/regi-ini.lua
diff --git a/tex/context/base/regi-ini.mkiv b/tex/context/base/mkiv/regi-ini.mkiv
index 6190393d8..6190393d8 100644
--- a/tex/context/base/regi-ini.mkiv
+++ b/tex/context/base/mkiv/regi-ini.mkiv
diff --git a/tex/context/base/regi-pdfdoc.lua b/tex/context/base/mkiv/regi-pdfdoc.lua
index 363d3ae0d..363d3ae0d 100644
--- a/tex/context/base/regi-pdfdoc.lua
+++ b/tex/context/base/mkiv/regi-pdfdoc.lua
diff --git a/tex/context/base/scrn-bar.mkvi b/tex/context/base/mkiv/scrn-bar.mkvi
index 8a2f9441c..8a2f9441c 100644
--- a/tex/context/base/scrn-bar.mkvi
+++ b/tex/context/base/mkiv/scrn-bar.mkvi
diff --git a/tex/context/base/scrn-but.lua b/tex/context/base/mkiv/scrn-but.lua
index 85cbf0b39..85cbf0b39 100644
--- a/tex/context/base/scrn-but.lua
+++ b/tex/context/base/mkiv/scrn-but.lua
diff --git a/tex/context/base/scrn-but.mkvi b/tex/context/base/mkiv/scrn-but.mkvi
index 1d5ffe6f3..1d5ffe6f3 100644
--- a/tex/context/base/scrn-but.mkvi
+++ b/tex/context/base/mkiv/scrn-but.mkvi
diff --git a/tex/context/base/scrn-fld.lua b/tex/context/base/mkiv/scrn-fld.lua
index 1563b9005..f68cc039d 100644
--- a/tex/context/base/scrn-fld.lua
+++ b/tex/context/base/mkiv/scrn-fld.lua
@@ -10,11 +10,13 @@ if not modules then modules = { } end modules ['scrn-fld'] = {
 
 local context       = context
 local ctx_doifelse  = commands.doifelse
-local implement = interfaces.implement
+local implement     = interfaces.implement
 
 local variables     = interfaces.variables
 local v_yes         = variables.yes
 
+local report        = logs.reporter("widgets")
+
 local texsetbox     = tex.setbox
 
 local fields        = { }
@@ -85,7 +87,12 @@ implement {
 implement {
     name     = "insertfield",
     actions  = function(name,specification)
-        texsetbox("b_scrn_field_body",insert(name,specification))
+        local b = insert(name,specification)
+        if b then
+            texsetbox("b_scrn_field_body",b)
+        else
+            report("unknown field %a",name)
+        end
     end,
     arguments = {
         "string",
diff --git a/tex/context/base/scrn-fld.mkvi b/tex/context/base/mkiv/scrn-fld.mkvi
index b61920de4..5acda1fc6 100644
--- a/tex/context/base/scrn-fld.mkvi
+++ b/tex/context/base/mkiv/scrn-fld.mkvi
@@ -752,7 +752,7 @@
   {\dotripleargument\scrn_fieldstack_define}
 
 \def\scrn_fieldstack_define[#tag][#symbols][#settings]%
-  {\ifcsname \??fieldstack#tag\endcsname
+  {\ifcsname\??fieldstack#tag\endcsname
      % already done
    \else
      \setgvalue{\??fieldstack#tag}{\scrn_fieldstack_construct[#tag][#symbols][#settings]}%
diff --git a/tex/context/base/scrn-hlp.lua b/tex/context/base/mkiv/scrn-hlp.lua
index 99c0565a8..99c0565a8 100644
--- a/tex/context/base/scrn-hlp.lua
+++ b/tex/context/base/mkiv/scrn-hlp.lua
diff --git a/tex/context/base/scrn-hlp.mkvi b/tex/context/base/mkiv/scrn-hlp.mkvi
index 7466e5687..7466e5687 100644
--- a/tex/context/base/scrn-hlp.mkvi
+++ b/tex/context/base/mkiv/scrn-hlp.mkvi
diff --git a/tex/context/base/scrn-ini.lua b/tex/context/base/mkiv/scrn-ini.lua
index ce9f9f71b..ce9f9f71b 100644
--- a/tex/context/base/scrn-ini.lua
+++ b/tex/context/base/mkiv/scrn-ini.lua
diff --git a/tex/context/base/scrn-ini.mkvi b/tex/context/base/mkiv/scrn-ini.mkvi
index 0e00fb456..0e00fb456 100644
--- a/tex/context/base/scrn-ini.mkvi
+++ b/tex/context/base/mkiv/scrn-ini.mkvi
diff --git a/tex/context/base/scrn-pag.lua b/tex/context/base/mkiv/scrn-pag.lua
index dba5b4786..dba5b4786 100644
--- a/tex/context/base/scrn-pag.lua
+++ b/tex/context/base/mkiv/scrn-pag.lua
diff --git a/tex/context/base/scrn-pag.mkvi b/tex/context/base/mkiv/scrn-pag.mkvi
index 3a01271ce..3a01271ce 100644
--- a/tex/context/base/scrn-pag.mkvi
+++ b/tex/context/base/mkiv/scrn-pag.mkvi
diff --git a/tex/context/base/scrn-ref.lua b/tex/context/base/mkiv/scrn-ref.lua
index c1fc94871..c1fc94871 100644
--- a/tex/context/base/scrn-ref.lua
+++ b/tex/context/base/mkiv/scrn-ref.lua
diff --git a/tex/context/base/scrn-ref.mkvi b/tex/context/base/mkiv/scrn-ref.mkvi
index 9a3f0c264..9a3f0c264 100644
--- a/tex/context/base/scrn-ref.mkvi
+++ b/tex/context/base/mkiv/scrn-ref.mkvi
diff --git a/tex/context/base/scrn-wid.lua b/tex/context/base/mkiv/scrn-wid.lua
index 72c9bc733..b9855546e 100644
--- a/tex/context/base/scrn-wid.lua
+++ b/tex/context/base/mkiv/scrn-wid.lua
@@ -47,8 +47,8 @@ implement {
     name      = "presetsymbollist",
     arguments = "string",
     actions   = function(list)
-                    codeinjections.presetsymbollist(list)
-                end
+        codeinjections.presetsymbollist(list)
+    end
 }
 
 -- Attachments
diff --git a/tex/context/base/scrn-wid.mkvi b/tex/context/base/mkiv/scrn-wid.mkvi
index f4679684c..f4679684c 100644
--- a/tex/context/base/scrn-wid.mkvi
+++ b/tex/context/base/mkiv/scrn-wid.mkvi
diff --git a/tex/context/base/scrp-cjk.lua b/tex/context/base/mkiv/scrp-cjk.lua
index 1d8191008..1d8191008 100644
--- a/tex/context/base/scrp-cjk.lua
+++ b/tex/context/base/mkiv/scrp-cjk.lua
diff --git a/tex/context/base/scrp-eth.lua b/tex/context/base/mkiv/scrp-eth.lua
index 8ecbce522..8ecbce522 100644
--- a/tex/context/base/scrp-eth.lua
+++ b/tex/context/base/mkiv/scrp-eth.lua
diff --git a/tex/context/base/scrp-ini.lua b/tex/context/base/mkiv/scrp-ini.lua
index 3c3517542..3c3517542 100644
--- a/tex/context/base/scrp-ini.lua
+++ b/tex/context/base/mkiv/scrp-ini.lua
diff --git a/tex/context/base/scrp-ini.mkiv b/tex/context/base/mkiv/scrp-ini.mkiv
index cd060c02b..cd060c02b 100644
--- a/tex/context/base/scrp-ini.mkiv
+++ b/tex/context/base/mkiv/scrp-ini.mkiv
diff --git a/tex/context/base/scrp-tha.lua b/tex/context/base/mkiv/scrp-tha.lua
index ec5df07c0..ec5df07c0 100644
--- a/tex/context/base/scrp-tha.lua
+++ b/tex/context/base/mkiv/scrp-tha.lua
diff --git a/tex/context/base/sort-ini.lua b/tex/context/base/mkiv/sort-ini.lua
index b21308657..b21308657 100644
--- a/tex/context/base/sort-ini.lua
+++ b/tex/context/base/mkiv/sort-ini.lua
diff --git a/tex/context/base/sort-ini.mkiv b/tex/context/base/mkiv/sort-ini.mkiv
index b7b490255..b7b490255 100644
--- a/tex/context/base/sort-ini.mkiv
+++ b/tex/context/base/mkiv/sort-ini.mkiv
diff --git a/tex/context/base/sort-lan.lua b/tex/context/base/mkiv/sort-lan.lua
index e84692afc..e84692afc 100644
--- a/tex/context/base/sort-lan.lua
+++ b/tex/context/base/mkiv/sort-lan.lua
diff --git a/tex/context/base/spac-adj.lua b/tex/context/base/mkiv/spac-adj.lua
index cdf9b5051..cdf9b5051 100644
--- a/tex/context/base/spac-adj.lua
+++ b/tex/context/base/mkiv/spac-adj.lua
diff --git a/tex/context/base/spac-adj.mkiv b/tex/context/base/mkiv/spac-adj.mkiv
index ad0f92a1f..ad0f92a1f 100644
--- a/tex/context/base/spac-adj.mkiv
+++ b/tex/context/base/mkiv/spac-adj.mkiv
diff --git a/tex/context/base/spac-ali.lua b/tex/context/base/mkiv/spac-ali.lua
index a67a30133..a67a30133 100644
--- a/tex/context/base/spac-ali.lua
+++ b/tex/context/base/mkiv/spac-ali.lua
diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/mkiv/spac-ali.mkiv
index 8b05577d0..f2774e680 100644
--- a/tex/context/base/spac-ali.mkiv
+++ b/tex/context/base/mkiv/spac-ali.mkiv
@@ -148,6 +148,35 @@
 \unexpanded\def\synchronizeinlinedirection
   {\textdir T\ifconditional\inlinelefttoright L\else R\fi T\relax}
 
+% maybe some day:
+%
+% \newcount\postdirpenalty % \zerocount
+% \newcount\predirpenalty  % \zerocount
+%
+% \def\spac_directions_post_break
+%   {\ifhmode
+%      \removeunwantedspaces
+%      \penalty\postdirpenalty
+%    \fi}
+%
+% \def\spac_directions_pre_break
+%   {\ifhmode
+%      \penalty\predirpenalty
+%      \ignorespaces
+%    \fi}
+%
+% \unexpanded\def\spac_directions_lefttoright_hmode
+%   {\settrue\inlinelefttoright
+%    \textdir TLT\relax
+%    \aftergroup\spac_directions_post_break
+%    \spac_directions_pre_break}
+%
+% \unexpanded\def\spac_directions_righttoleft_hmode
+%   {\textdir TRT\relax
+%    \setfalse\inlinelefttoright
+%    \aftergroup\spac_directions_post_break
+%    \spac_directions_pre_break}
+
 \unexpanded\def\showdirections
   {\dontleavehmode
    \begingroup\infofont\textdir TLT[\space
diff --git a/tex/context/base/spac-chr.lua b/tex/context/base/mkiv/spac-chr.lua
index 3eb348586..3eb348586 100644
--- a/tex/context/base/spac-chr.lua
+++ b/tex/context/base/mkiv/spac-chr.lua
diff --git a/tex/context/base/spac-chr.mkiv b/tex/context/base/mkiv/spac-chr.mkiv
index 562fb940c..562fb940c 100644
--- a/tex/context/base/spac-chr.mkiv
+++ b/tex/context/base/mkiv/spac-chr.mkiv
diff --git a/tex/context/base/spac-def.mkiv b/tex/context/base/mkiv/spac-def.mkiv
index 7ead3c63e..7ead3c63e 100644
--- a/tex/context/base/spac-def.mkiv
+++ b/tex/context/base/mkiv/spac-def.mkiv
diff --git a/tex/context/base/spac-flr.mkiv b/tex/context/base/mkiv/spac-flr.mkiv
index d09a9cf79..d09a9cf79 100644
--- a/tex/context/base/spac-flr.mkiv
+++ b/tex/context/base/mkiv/spac-flr.mkiv
diff --git a/tex/context/base/spac-grd.mkiv b/tex/context/base/mkiv/spac-grd.mkiv
index 7b3ee6d6c..7b3ee6d6c 100644
--- a/tex/context/base/spac-grd.mkiv
+++ b/tex/context/base/mkiv/spac-grd.mkiv
diff --git a/tex/context/base/spac-hor.lua b/tex/context/base/mkiv/spac-hor.lua
index 5d5a43e31..5d5a43e31 100644
--- a/tex/context/base/spac-hor.lua
+++ b/tex/context/base/mkiv/spac-hor.lua
diff --git a/tex/context/base/spac-hor.mkiv b/tex/context/base/mkiv/spac-hor.mkiv
index 94e45f47a..94e45f47a 100644
--- a/tex/context/base/spac-hor.mkiv
+++ b/tex/context/base/mkiv/spac-hor.mkiv
diff --git a/tex/context/base/spac-lin.mkiv b/tex/context/base/mkiv/spac-lin.mkiv
index c4c6eb6d9..c4c6eb6d9 100644
--- a/tex/context/base/spac-lin.mkiv
+++ b/tex/context/base/mkiv/spac-lin.mkiv
diff --git a/tex/context/base/spac-pag.mkiv b/tex/context/base/mkiv/spac-pag.mkiv
index c7d22f0e0..c7d22f0e0 100644
--- a/tex/context/base/spac-pag.mkiv
+++ b/tex/context/base/mkiv/spac-pag.mkiv
diff --git a/tex/context/base/spac-par.mkiv b/tex/context/base/mkiv/spac-par.mkiv
index 4dd3db243..4dd3db243 100644
--- a/tex/context/base/spac-par.mkiv
+++ b/tex/context/base/mkiv/spac-par.mkiv
diff --git a/tex/context/base/spac-prf.lua b/tex/context/base/mkiv/spac-prf.lua
index fd4ddea61..fd4ddea61 100644
--- a/tex/context/base/spac-prf.lua
+++ b/tex/context/base/mkiv/spac-prf.lua
diff --git a/tex/context/base/spac-prf.mkvi b/tex/context/base/mkiv/spac-prf.mkvi
index 8d150f58d..8d150f58d 100644
--- a/tex/context/base/spac-prf.mkvi
+++ b/tex/context/base/mkiv/spac-prf.mkvi
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/mkiv/spac-ver.lua
index 3095bbbd7..3095bbbd7 100644
--- a/tex/context/base/spac-ver.lua
+++ b/tex/context/base/mkiv/spac-ver.lua
diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv
index ee30cb264..ee30cb264 100644
--- a/tex/context/base/spac-ver.mkiv
+++ b/tex/context/base/mkiv/spac-ver.mkiv
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
new file mode 100644
index 000000000..a2a1ad229
--- /dev/null
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 376329322..879e20632 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/mkiv/status-mkiv.lua
index 3fe9e0d8e..3fe9e0d8e 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/mkiv/status-mkiv.lua
diff --git a/tex/context/base/status-mkiv.tex b/tex/context/base/mkiv/status-mkiv.tex
index 8685c97ad..8685c97ad 100644
--- a/tex/context/base/status-mkiv.tex
+++ b/tex/context/base/mkiv/status-mkiv.tex
diff --git a/tex/context/base/strc-bkm.lua b/tex/context/base/mkiv/strc-bkm.lua
index a055a97a1..a055a97a1 100644
--- a/tex/context/base/strc-bkm.lua
+++ b/tex/context/base/mkiv/strc-bkm.lua
diff --git a/tex/context/base/strc-bkm.mkiv b/tex/context/base/mkiv/strc-bkm.mkiv
index 5a8dba562..5a8dba562 100644
--- a/tex/context/base/strc-bkm.mkiv
+++ b/tex/context/base/mkiv/strc-bkm.mkiv
diff --git a/tex/context/base/strc-blk.lua b/tex/context/base/mkiv/strc-blk.lua
index 0ababcfc0..0ababcfc0 100644
--- a/tex/context/base/strc-blk.lua
+++ b/tex/context/base/mkiv/strc-blk.lua
diff --git a/tex/context/base/strc-blk.mkiv b/tex/context/base/mkiv/strc-blk.mkiv
index fe259d223..fe259d223 100644
--- a/tex/context/base/strc-blk.mkiv
+++ b/tex/context/base/mkiv/strc-blk.mkiv
diff --git a/tex/context/base/strc-con.lua b/tex/context/base/mkiv/strc-con.lua
index 29a1c0cb3..29a1c0cb3 100644
--- a/tex/context/base/strc-con.lua
+++ b/tex/context/base/mkiv/strc-con.lua
diff --git a/tex/context/base/strc-con.mkvi b/tex/context/base/mkiv/strc-con.mkvi
index 792f3b156..792f3b156 100644
--- a/tex/context/base/strc-con.mkvi
+++ b/tex/context/base/mkiv/strc-con.mkvi
diff --git a/tex/context/base/strc-def.mkiv b/tex/context/base/mkiv/strc-def.mkiv
index 962c46b48..962c46b48 100644
--- a/tex/context/base/strc-def.mkiv
+++ b/tex/context/base/mkiv/strc-def.mkiv
diff --git a/tex/context/base/strc-des.mkvi b/tex/context/base/mkiv/strc-des.mkvi
index 83daba0fe..83daba0fe 100644
--- a/tex/context/base/strc-des.mkvi
+++ b/tex/context/base/mkiv/strc-des.mkvi
diff --git a/tex/context/base/strc-doc.lua b/tex/context/base/mkiv/strc-doc.lua
index 885e2de0b..885e2de0b 100644
--- a/tex/context/base/strc-doc.lua
+++ b/tex/context/base/mkiv/strc-doc.lua
diff --git a/tex/context/base/strc-doc.mkiv b/tex/context/base/mkiv/strc-doc.mkiv
index c453f199e..c453f199e 100644
--- a/tex/context/base/strc-doc.mkiv
+++ b/tex/context/base/mkiv/strc-doc.mkiv
diff --git a/tex/context/base/strc-enu.mkvi b/tex/context/base/mkiv/strc-enu.mkvi
index b76bc0067..b76bc0067 100644
--- a/tex/context/base/strc-enu.mkvi
+++ b/tex/context/base/mkiv/strc-enu.mkvi
diff --git a/tex/context/base/strc-flt.lua b/tex/context/base/mkiv/strc-flt.lua
index 466fd515e..466fd515e 100644
--- a/tex/context/base/strc-flt.lua
+++ b/tex/context/base/mkiv/strc-flt.lua
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi
index ff06b4609..ff06b4609 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/mkiv/strc-flt.mkvi
diff --git a/tex/context/base/strc-ind.mkiv b/tex/context/base/mkiv/strc-ind.mkiv
index 2748fd684..2748fd684 100644
--- a/tex/context/base/strc-ind.mkiv
+++ b/tex/context/base/mkiv/strc-ind.mkiv
diff --git a/tex/context/base/strc-ini.lua b/tex/context/base/mkiv/strc-ini.lua
index 7a6153096..7a6153096 100644
--- a/tex/context/base/strc-ini.lua
+++ b/tex/context/base/mkiv/strc-ini.lua
diff --git a/tex/context/base/strc-ini.mkvi b/tex/context/base/mkiv/strc-ini.mkvi
index ad83cbc58..ad83cbc58 100644
--- a/tex/context/base/strc-ini.mkvi
+++ b/tex/context/base/mkiv/strc-ini.mkvi
diff --git a/tex/context/base/strc-itm.lua b/tex/context/base/mkiv/strc-itm.lua
index adec591c1..adec591c1 100644
--- a/tex/context/base/strc-itm.lua
+++ b/tex/context/base/mkiv/strc-itm.lua
diff --git a/tex/context/base/strc-itm.mkvi b/tex/context/base/mkiv/strc-itm.mkvi
index 03ae38fb7..f9700c481 100644
--- a/tex/context/base/strc-itm.mkvi
+++ b/tex/context/base/mkiv/strc-itm.mkvi
@@ -1604,10 +1604,10 @@
    \c!leftmargin=\zeropoint,
    \c!rightmargin=\zeropoint,
    \c!indentnext=\v!yes,
-   \c!width=1.5em,
+   \c!width=1.5\emwidth,
    \c!factor=0,
   %\c!distance=.5em, % is now:
-   \c!step=.5em, % deals with broad
+   \c!step=.5\emwidth, % deals with broad
    \c!distance=\zeropoint,
   %\c!align=\v!normal, % definitely not \v!normal !
   %\c!symalign=,
diff --git a/tex/context/base/strc-lab.mkiv b/tex/context/base/mkiv/strc-lab.mkiv
index ac49941aa..ac49941aa 100644
--- a/tex/context/base/strc-lab.mkiv
+++ b/tex/context/base/mkiv/strc-lab.mkiv
diff --git a/tex/context/base/strc-lev.lua b/tex/context/base/mkiv/strc-lev.lua
index d7ffd6af4..d7ffd6af4 100644
--- a/tex/context/base/strc-lev.lua
+++ b/tex/context/base/mkiv/strc-lev.lua
diff --git a/tex/context/base/strc-lev.mkvi b/tex/context/base/mkiv/strc-lev.mkvi
index dae3f28e3..dae3f28e3 100644
--- a/tex/context/base/strc-lev.mkvi
+++ b/tex/context/base/mkiv/strc-lev.mkvi
diff --git a/tex/context/base/strc-lnt.mkvi b/tex/context/base/mkiv/strc-lnt.mkvi
index cd10c9def..cd10c9def 100644
--- a/tex/context/base/strc-lnt.mkvi
+++ b/tex/context/base/mkiv/strc-lnt.mkvi
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/mkiv/strc-lst.lua
index 79f4dfc39..79f4dfc39 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/mkiv/strc-lst.lua
diff --git a/tex/context/base/strc-lst.mkvi b/tex/context/base/mkiv/strc-lst.mkvi
index 90b121399..90b121399 100644
--- a/tex/context/base/strc-lst.mkvi
+++ b/tex/context/base/mkiv/strc-lst.mkvi
diff --git a/tex/context/base/strc-mar.lua b/tex/context/base/mkiv/strc-mar.lua
index 8b30e8514..8b30e8514 100644
--- a/tex/context/base/strc-mar.lua
+++ b/tex/context/base/mkiv/strc-mar.lua
diff --git a/tex/context/base/strc-mar.mkiv b/tex/context/base/mkiv/strc-mar.mkiv
index 4e8df5f5d..4e8df5f5d 100644
--- a/tex/context/base/strc-mar.mkiv
+++ b/tex/context/base/mkiv/strc-mar.mkiv
diff --git a/tex/context/base/strc-mat.lua b/tex/context/base/mkiv/strc-mat.lua
index 87f35ed1d..87f35ed1d 100644
--- a/tex/context/base/strc-mat.lua
+++ b/tex/context/base/mkiv/strc-mat.lua
diff --git a/tex/context/base/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 6bf9b149b..6bf9b149b 100644
--- a/tex/context/base/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
diff --git a/tex/context/base/strc-not.lua b/tex/context/base/mkiv/strc-not.lua
index 71eccf1ce..71eccf1ce 100644
--- a/tex/context/base/strc-not.lua
+++ b/tex/context/base/mkiv/strc-not.lua
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index c3dc86f3e..c3dc86f3e 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
diff --git a/tex/context/base/strc-num.lua b/tex/context/base/mkiv/strc-num.lua
index 0203334ff..0203334ff 100644
--- a/tex/context/base/strc-num.lua
+++ b/tex/context/base/mkiv/strc-num.lua
diff --git a/tex/context/base/strc-num.mkiv b/tex/context/base/mkiv/strc-num.mkiv
index e9eaca11b..e9eaca11b 100644
--- a/tex/context/base/strc-num.mkiv
+++ b/tex/context/base/mkiv/strc-num.mkiv
diff --git a/tex/context/base/strc-pag.lua b/tex/context/base/mkiv/strc-pag.lua
index 96d26e6f6..96d26e6f6 100644
--- a/tex/context/base/strc-pag.lua
+++ b/tex/context/base/mkiv/strc-pag.lua
diff --git a/tex/context/base/strc-pag.mkiv b/tex/context/base/mkiv/strc-pag.mkiv
index bc4ec8888..bc4ec8888 100644
--- a/tex/context/base/strc-pag.mkiv
+++ b/tex/context/base/mkiv/strc-pag.mkiv
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/mkiv/strc-ref.lua
index d9b7798e4..d9b7798e4 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/mkiv/strc-ref.lua
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/mkiv/strc-ref.mkvi
index 404bef62f..404bef62f 100644
--- a/tex/context/base/strc-ref.mkvi
+++ b/tex/context/base/mkiv/strc-ref.mkvi
diff --git a/tex/context/base/strc-reg.lua b/tex/context/base/mkiv/strc-reg.lua
index ed3292195..ed3292195 100644
--- a/tex/context/base/strc-reg.lua
+++ b/tex/context/base/mkiv/strc-reg.lua
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/mkiv/strc-reg.mkiv
index fd4a81657..fd4a81657 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/mkiv/strc-reg.mkiv
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/mkiv/strc-ren.mkiv
index f68a79aa9..f68a79aa9 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/mkiv/strc-ren.mkiv
diff --git a/tex/context/base/strc-rsc.lua b/tex/context/base/mkiv/strc-rsc.lua
index 627e443b2..627e443b2 100644
--- a/tex/context/base/strc-rsc.lua
+++ b/tex/context/base/mkiv/strc-rsc.lua
diff --git a/tex/context/base/strc-sbe.mkiv b/tex/context/base/mkiv/strc-sbe.mkiv
index 9f1d214cf..9f1d214cf 100644
--- a/tex/context/base/strc-sbe.mkiv
+++ b/tex/context/base/mkiv/strc-sbe.mkiv
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/mkiv/strc-sec.mkiv
index c57fb2dd6..c57fb2dd6 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/mkiv/strc-sec.mkiv
diff --git a/tex/context/base/strc-syn.lua b/tex/context/base/mkiv/strc-syn.lua
index 5f3557a69..5f3557a69 100644
--- a/tex/context/base/strc-syn.lua
+++ b/tex/context/base/mkiv/strc-syn.lua
diff --git a/tex/context/base/strc-syn.mkiv b/tex/context/base/mkiv/strc-syn.mkiv
index 28d418751..28d418751 100644
--- a/tex/context/base/strc-syn.mkiv
+++ b/tex/context/base/mkiv/strc-syn.mkiv
diff --git a/tex/context/base/strc-tag.lua b/tex/context/base/mkiv/strc-tag.lua
index 8f2e18978..8f2e18978 100644
--- a/tex/context/base/strc-tag.lua
+++ b/tex/context/base/mkiv/strc-tag.lua
diff --git a/tex/context/base/strc-tag.mkiv b/tex/context/base/mkiv/strc-tag.mkiv
index c9132bf04..c9132bf04 100644
--- a/tex/context/base/strc-tag.mkiv
+++ b/tex/context/base/mkiv/strc-tag.mkiv
diff --git a/tex/context/base/strc-xml.mkiv b/tex/context/base/mkiv/strc-xml.mkiv
index 3f9b4ef81..3f9b4ef81 100644
--- a/tex/context/base/strc-xml.mkiv
+++ b/tex/context/base/mkiv/strc-xml.mkiv
diff --git a/tex/context/base/supp-box.lua b/tex/context/base/mkiv/supp-box.lua
index d3a4f57e5..d3a4f57e5 100644
--- a/tex/context/base/supp-box.lua
+++ b/tex/context/base/mkiv/supp-box.lua
diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv
index e36671277..e36671277 100644
--- a/tex/context/base/supp-box.mkiv
+++ b/tex/context/base/mkiv/supp-box.mkiv
diff --git a/tex/context/base/supp-dir.mkiv b/tex/context/base/mkiv/supp-dir.mkiv
index 6251012b6..6251012b6 100644
--- a/tex/context/base/supp-dir.mkiv
+++ b/tex/context/base/mkiv/supp-dir.mkiv
diff --git a/tex/context/base/supp-mat.mkiv b/tex/context/base/mkiv/supp-mat.mkiv
index 925f25cc4..925f25cc4 100644
--- a/tex/context/base/supp-mat.mkiv
+++ b/tex/context/base/mkiv/supp-mat.mkiv
diff --git a/tex/context/base/supp-ran.lua b/tex/context/base/mkiv/supp-ran.lua
index 4968e8cfc..4968e8cfc 100644
--- a/tex/context/base/supp-ran.lua
+++ b/tex/context/base/mkiv/supp-ran.lua
diff --git a/tex/context/base/supp-ran.mkiv b/tex/context/base/mkiv/supp-ran.mkiv
index f7cfd6e73..f7cfd6e73 100644
--- a/tex/context/base/supp-ran.mkiv
+++ b/tex/context/base/mkiv/supp-ran.mkiv
diff --git a/tex/context/base/supp-vis.mkiv b/tex/context/base/mkiv/supp-vis.mkiv
index de7c4288d..de7c4288d 100644
--- a/tex/context/base/supp-vis.mkiv
+++ b/tex/context/base/mkiv/supp-vis.mkiv
diff --git a/tex/context/base/symb-imp-cc.mkiv b/tex/context/base/mkiv/symb-imp-cc.mkiv
index e753d695f..e753d695f 100644
--- a/tex/context/base/symb-imp-cc.mkiv
+++ b/tex/context/base/mkiv/symb-imp-cc.mkiv
diff --git a/tex/context/base/symb-imp-cow.mkiv b/tex/context/base/mkiv/symb-imp-cow.mkiv
index 59eabae28..59eabae28 100644
--- a/tex/context/base/symb-imp-cow.mkiv
+++ b/tex/context/base/mkiv/symb-imp-cow.mkiv
diff --git a/tex/context/base/symb-imp-eur.mkiv b/tex/context/base/mkiv/symb-imp-eur.mkiv
index 19a88c8fa..19a88c8fa 100644
--- a/tex/context/base/symb-imp-eur.mkiv
+++ b/tex/context/base/mkiv/symb-imp-eur.mkiv
diff --git a/tex/context/base/symb-imp-jmn.mkiv b/tex/context/base/mkiv/symb-imp-jmn.mkiv
index d66e0a332..d66e0a332 100644
--- a/tex/context/base/symb-imp-jmn.mkiv
+++ b/tex/context/base/mkiv/symb-imp-jmn.mkiv
diff --git a/tex/context/base/symb-imp-mis.mkiv b/tex/context/base/mkiv/symb-imp-mis.mkiv
index d2657512f..d2657512f 100644
--- a/tex/context/base/symb-imp-mis.mkiv
+++ b/tex/context/base/mkiv/symb-imp-mis.mkiv
diff --git a/tex/context/base/symb-imp-mvs.mkiv b/tex/context/base/mkiv/symb-imp-mvs.mkiv
index 9902fc9e8..9902fc9e8 100644
--- a/tex/context/base/symb-imp-mvs.mkiv
+++ b/tex/context/base/mkiv/symb-imp-mvs.mkiv
diff --git a/tex/context/base/symb-imp-nav.mkiv b/tex/context/base/mkiv/symb-imp-nav.mkiv
index 6e2f2c1f0..6e2f2c1f0 100644
--- a/tex/context/base/symb-imp-nav.mkiv
+++ b/tex/context/base/mkiv/symb-imp-nav.mkiv
diff --git a/tex/context/base/symb-ini.lua b/tex/context/base/mkiv/symb-ini.lua
index 6a4a18825..6a4a18825 100644
--- a/tex/context/base/symb-ini.lua
+++ b/tex/context/base/mkiv/symb-ini.lua
diff --git a/tex/context/base/symb-ini.mkiv b/tex/context/base/mkiv/symb-ini.mkiv
index 23879b43a..23879b43a 100644
--- a/tex/context/base/symb-ini.mkiv
+++ b/tex/context/base/mkiv/symb-ini.mkiv
diff --git a/tex/context/base/symb-run.mkiv b/tex/context/base/mkiv/symb-run.mkiv
index 3d92c4416..3d92c4416 100644
--- a/tex/context/base/symb-run.mkiv
+++ b/tex/context/base/mkiv/symb-run.mkiv
diff --git a/tex/context/base/syst-aux.lua b/tex/context/base/mkiv/syst-aux.lua
index 0e7b2c2b6..0e7b2c2b6 100644
--- a/tex/context/base/syst-aux.lua
+++ b/tex/context/base/mkiv/syst-aux.lua
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/mkiv/syst-aux.mkiv
index 5b7059ea9..5b7059ea9 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/mkiv/syst-aux.mkiv
diff --git a/tex/context/base/syst-con.lua b/tex/context/base/mkiv/syst-con.lua
index 0fa685b2d..0fa685b2d 100644
--- a/tex/context/base/syst-con.lua
+++ b/tex/context/base/mkiv/syst-con.lua
diff --git a/tex/context/base/syst-con.mkiv b/tex/context/base/mkiv/syst-con.mkiv
index 17c407819..17c407819 100644
--- a/tex/context/base/syst-con.mkiv
+++ b/tex/context/base/mkiv/syst-con.mkiv
diff --git a/tex/context/base/syst-fnt.mkiv b/tex/context/base/mkiv/syst-fnt.mkiv
index 625b952b7..625b952b7 100644
--- a/tex/context/base/syst-fnt.mkiv
+++ b/tex/context/base/mkiv/syst-fnt.mkiv
diff --git a/tex/context/base/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv
index cd8238c76..93c21c6ce 100644
--- a/tex/context/base/syst-ini.mkiv
+++ b/tex/context/base/mkiv/syst-ini.mkiv
@@ -389,6 +389,7 @@
     \edef\pdflinkmargin          {\pdfvariable linkmargin}          \pdflinkmargin          0pt
     \edef\pdfdestmargin          {\pdfvariable destmargin}          \pdfdestmargin          0pt
     \edef\pdfthreadmargin        {\pdfvariable threadmargin}        \pdfthreadmargin        0pt
+  % \edef\pdfxformmargin         {\pdfvariable xformmargin}         \pdfxformmargin         0pt
 
     \edef\pdfpagesattr           {\pdfvariable pagesattr}
     \edef\pdfpageattr            {\pdfvariable pageattr}
diff --git a/tex/context/base/syst-lua.lua b/tex/context/base/mkiv/syst-lua.lua
index 422f57a00..422f57a00 100644
--- a/tex/context/base/syst-lua.lua
+++ b/tex/context/base/mkiv/syst-lua.lua
diff --git a/tex/context/base/syst-lua.mkiv b/tex/context/base/mkiv/syst-lua.mkiv
index b5001ab62..b5001ab62 100644
--- a/tex/context/base/syst-lua.mkiv
+++ b/tex/context/base/mkiv/syst-lua.mkiv
diff --git a/tex/context/base/syst-mes.mkiv b/tex/context/base/mkiv/syst-mes.mkiv
index 4cd36e24b..4cd36e24b 100644
--- a/tex/context/base/syst-mes.mkiv
+++ b/tex/context/base/mkiv/syst-mes.mkiv
diff --git a/tex/context/base/syst-pln.mkiv b/tex/context/base/mkiv/syst-pln.mkiv
index 248113120..248113120 100644
--- a/tex/context/base/syst-pln.mkiv
+++ b/tex/context/base/mkiv/syst-pln.mkiv
diff --git a/tex/context/base/tabl-com.mkiv b/tex/context/base/mkiv/tabl-com.mkiv
index e90086368..e90086368 100644
--- a/tex/context/base/tabl-com.mkiv
+++ b/tex/context/base/mkiv/tabl-com.mkiv
diff --git a/tex/context/base/tabl-ltb.mkiv b/tex/context/base/mkiv/tabl-ltb.mkiv
index b0e3f52e4..b0e3f52e4 100644
--- a/tex/context/base/tabl-ltb.mkiv
+++ b/tex/context/base/mkiv/tabl-ltb.mkiv
diff --git a/tex/context/base/tabl-mis.mkiv b/tex/context/base/mkiv/tabl-mis.mkiv
index 8db31b31d..8db31b31d 100644
--- a/tex/context/base/tabl-mis.mkiv
+++ b/tex/context/base/mkiv/tabl-mis.mkiv
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv
index 78e867546..78e867546 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/mkiv/tabl-ntb.mkiv
diff --git a/tex/context/base/tabl-nte.mkiv b/tex/context/base/mkiv/tabl-nte.mkiv
index af74a2abe..af74a2abe 100644
--- a/tex/context/base/tabl-nte.mkiv
+++ b/tex/context/base/mkiv/tabl-nte.mkiv
diff --git a/tex/context/base/tabl-pln.mkiv b/tex/context/base/mkiv/tabl-pln.mkiv
index 3638006c7..3638006c7 100644
--- a/tex/context/base/tabl-pln.mkiv
+++ b/tex/context/base/mkiv/tabl-pln.mkiv
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/mkiv/tabl-tab.mkiv
index c8ddd131e..c8ddd131e 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/mkiv/tabl-tab.mkiv
diff --git a/tex/context/base/tabl-tbl.lua b/tex/context/base/mkiv/tabl-tbl.lua
index 13d899de6..13d899de6 100644
--- a/tex/context/base/tabl-tbl.lua
+++ b/tex/context/base/mkiv/tabl-tbl.lua
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/mkiv/tabl-tbl.mkiv
index f7305b5bb..f7305b5bb 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/mkiv/tabl-tbl.mkiv
diff --git a/tex/context/base/tabl-tsp.mkiv b/tex/context/base/mkiv/tabl-tsp.mkiv
index e0c3b9b74..e0c3b9b74 100644
--- a/tex/context/base/tabl-tsp.mkiv
+++ b/tex/context/base/mkiv/tabl-tsp.mkiv
diff --git a/tex/context/base/tabl-xnt.mkvi b/tex/context/base/mkiv/tabl-xnt.mkvi
index fd2de5a13..fd2de5a13 100644
--- a/tex/context/base/tabl-xnt.mkvi
+++ b/tex/context/base/mkiv/tabl-xnt.mkvi
diff --git a/tex/context/base/tabl-xtb.lua b/tex/context/base/mkiv/tabl-xtb.lua
index 87d5fa121..87d5fa121 100644
--- a/tex/context/base/tabl-xtb.lua
+++ b/tex/context/base/mkiv/tabl-xtb.lua
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/mkiv/tabl-xtb.mkvi
index 06a5318e1..06a5318e1 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/mkiv/tabl-xtb.mkvi
diff --git a/tex/context/base/task-ini.lua b/tex/context/base/mkiv/task-ini.lua
index ebfbbdc26..ebfbbdc26 100644
--- a/tex/context/base/task-ini.lua
+++ b/tex/context/base/mkiv/task-ini.lua
diff --git a/tex/context/base/task-ini.mkiv b/tex/context/base/mkiv/task-ini.mkiv
index 6cdbe739f..6cdbe739f 100644
--- a/tex/context/base/task-ini.mkiv
+++ b/tex/context/base/mkiv/task-ini.mkiv
diff --git a/tex/context/base/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua
index b66c24c16..b66c24c16 100644
--- a/tex/context/base/toks-ini.lua
+++ b/tex/context/base/mkiv/toks-ini.lua
diff --git a/tex/context/base/toks-ini.mkiv b/tex/context/base/mkiv/toks-ini.mkiv
index 49625a939..49625a939 100644
--- a/tex/context/base/toks-ini.mkiv
+++ b/tex/context/base/mkiv/toks-ini.mkiv
diff --git a/tex/context/base/toks-map.lua b/tex/context/base/mkiv/toks-map.lua
index 9120c2084..9120c2084 100644
--- a/tex/context/base/toks-map.lua
+++ b/tex/context/base/mkiv/toks-map.lua
diff --git a/tex/context/base/toks-map.mkiv b/tex/context/base/mkiv/toks-map.mkiv
index f1b63a68b..f1b63a68b 100644
--- a/tex/context/base/toks-map.mkiv
+++ b/tex/context/base/mkiv/toks-map.mkiv
diff --git a/tex/context/base/toks-scn.lua b/tex/context/base/mkiv/toks-scn.lua
index 5c8dee8f3..5c8dee8f3 100644
--- a/tex/context/base/toks-scn.lua
+++ b/tex/context/base/mkiv/toks-scn.lua
diff --git a/tex/context/base/toks-tra.lua b/tex/context/base/mkiv/toks-tra.lua
index 4b0b82f0a..4b0b82f0a 100644
--- a/tex/context/base/toks-tra.lua
+++ b/tex/context/base/mkiv/toks-tra.lua
diff --git a/tex/context/base/toks-tra.mkiv b/tex/context/base/mkiv/toks-tra.mkiv
index a3e27eaf8..a3e27eaf8 100644
--- a/tex/context/base/toks-tra.mkiv
+++ b/tex/context/base/mkiv/toks-tra.mkiv
diff --git a/tex/context/base/trac-ctx.lua b/tex/context/base/mkiv/trac-ctx.lua
index 493ce7936..493ce7936 100644
--- a/tex/context/base/trac-ctx.lua
+++ b/tex/context/base/mkiv/trac-ctx.lua
diff --git a/tex/context/base/trac-ctx.mkiv b/tex/context/base/mkiv/trac-ctx.mkiv
index 4240281a6..4240281a6 100644
--- a/tex/context/base/trac-ctx.mkiv
+++ b/tex/context/base/mkiv/trac-ctx.mkiv
diff --git a/tex/context/base/trac-deb.lua b/tex/context/base/mkiv/trac-deb.lua
index 792ad9b56..792ad9b56 100644
--- a/tex/context/base/trac-deb.lua
+++ b/tex/context/base/mkiv/trac-deb.lua
diff --git a/tex/context/base/trac-deb.mkiv b/tex/context/base/mkiv/trac-deb.mkiv
index 1e61a3512..1e61a3512 100644
--- a/tex/context/base/trac-deb.mkiv
+++ b/tex/context/base/mkiv/trac-deb.mkiv
diff --git a/tex/context/base/trac-exp.lua b/tex/context/base/mkiv/trac-exp.lua
index 5879f1b7b..5879f1b7b 100644
--- a/tex/context/base/trac-exp.lua
+++ b/tex/context/base/mkiv/trac-exp.lua
diff --git a/tex/context/base/trac-fil.lua b/tex/context/base/mkiv/trac-fil.lua
index 8cc903e2a..8cc903e2a 100644
--- a/tex/context/base/trac-fil.lua
+++ b/tex/context/base/mkiv/trac-fil.lua
diff --git a/tex/context/base/trac-inf.lua b/tex/context/base/mkiv/trac-inf.lua
index f4c4e5557..f4c4e5557 100644
--- a/tex/context/base/trac-inf.lua
+++ b/tex/context/base/mkiv/trac-inf.lua
diff --git a/tex/context/base/trac-jus.lua b/tex/context/base/mkiv/trac-jus.lua
index ad1a098e2..ad1a098e2 100644
--- a/tex/context/base/trac-jus.lua
+++ b/tex/context/base/mkiv/trac-jus.lua
diff --git a/tex/context/base/trac-jus.mkiv b/tex/context/base/mkiv/trac-jus.mkiv
index d0823d311..d0823d311 100644
--- a/tex/context/base/trac-jus.mkiv
+++ b/tex/context/base/mkiv/trac-jus.mkiv
diff --git a/tex/context/base/trac-lmx.lua b/tex/context/base/mkiv/trac-lmx.lua
index 4f4ea62c4..4f4ea62c4 100644
--- a/tex/context/base/trac-lmx.lua
+++ b/tex/context/base/mkiv/trac-lmx.lua
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/mkiv/trac-log.lua
index 5745460cc..5745460cc 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/mkiv/trac-log.lua
diff --git a/tex/context/base/trac-par.lua b/tex/context/base/mkiv/trac-par.lua
index aab57ce5c..aab57ce5c 100644
--- a/tex/context/base/trac-par.lua
+++ b/tex/context/base/mkiv/trac-par.lua
diff --git a/tex/context/base/trac-pro.lua b/tex/context/base/mkiv/trac-pro.lua
index 897b6a15c..897b6a15c 100644
--- a/tex/context/base/trac-pro.lua
+++ b/tex/context/base/mkiv/trac-pro.lua
diff --git a/tex/context/base/trac-set.lua b/tex/context/base/mkiv/trac-set.lua
index 9e2bf8758..9e2bf8758 100644
--- a/tex/context/base/trac-set.lua
+++ b/tex/context/base/mkiv/trac-set.lua
diff --git a/tex/context/base/trac-tex.lua b/tex/context/base/mkiv/trac-tex.lua
index 24dc3f1bd..24dc3f1bd 100644
--- a/tex/context/base/trac-tex.lua
+++ b/tex/context/base/mkiv/trac-tex.lua
diff --git a/tex/context/base/trac-tex.mkiv b/tex/context/base/mkiv/trac-tex.mkiv
index 53c95ab01..53c95ab01 100644
--- a/tex/context/base/trac-tex.mkiv
+++ b/tex/context/base/mkiv/trac-tex.mkiv
diff --git a/tex/context/base/trac-tim.lua b/tex/context/base/mkiv/trac-tim.lua
index b4744291c..b4744291c 100644
--- a/tex/context/base/trac-tim.lua
+++ b/tex/context/base/mkiv/trac-tim.lua
diff --git a/tex/context/base/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua
index bb94c484b..bb94c484b 100644
--- a/tex/context/base/trac-vis.lua
+++ b/tex/context/base/mkiv/trac-vis.lua
diff --git a/tex/context/base/trac-vis.mkiv b/tex/context/base/mkiv/trac-vis.mkiv
index a503981f5..a503981f5 100644
--- a/tex/context/base/trac-vis.mkiv
+++ b/tex/context/base/mkiv/trac-vis.mkiv
diff --git a/tex/context/base/trac-xml.lua b/tex/context/base/mkiv/trac-xml.lua
index cd8b8c0a5..cd8b8c0a5 100644
--- a/tex/context/base/trac-xml.lua
+++ b/tex/context/base/mkiv/trac-xml.lua
diff --git a/tex/context/base/type-def.mkiv b/tex/context/base/mkiv/type-def.mkiv
index a80b4f7bd..a80b4f7bd 100644
--- a/tex/context/base/type-def.mkiv
+++ b/tex/context/base/mkiv/type-def.mkiv
diff --git a/tex/context/base/type-fbk.mkiv b/tex/context/base/mkiv/type-fbk.mkiv
index 4ac381787..4ac381787 100644
--- a/tex/context/base/type-fbk.mkiv
+++ b/tex/context/base/mkiv/type-fbk.mkiv
diff --git a/tex/context/base/type-ini.lua b/tex/context/base/mkiv/type-ini.lua
index cd5b32d3e..cd5b32d3e 100644
--- a/tex/context/base/type-ini.lua
+++ b/tex/context/base/mkiv/type-ini.lua
diff --git a/tex/context/base/type-ini.mkvi b/tex/context/base/mkiv/type-ini.mkvi
index e4cd0b0b1..e4cd0b0b1 100644
--- a/tex/context/base/type-ini.mkvi
+++ b/tex/context/base/mkiv/type-ini.mkvi
diff --git a/tex/context/base/type-lua.mkiv b/tex/context/base/mkiv/type-lua.mkiv
index fac6c3867..fac6c3867 100644
--- a/tex/context/base/type-lua.mkiv
+++ b/tex/context/base/mkiv/type-lua.mkiv
diff --git a/tex/context/base/type-one.mkiv b/tex/context/base/mkiv/type-one.mkiv
index 12b9e14ad..12b9e14ad 100644
--- a/tex/context/base/type-one.mkiv
+++ b/tex/context/base/mkiv/type-one.mkiv
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/mkiv/type-otf.mkiv
index 1f1564ef5..1f1564ef5 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/mkiv/type-otf.mkiv
diff --git a/tex/context/base/type-run.mkiv b/tex/context/base/mkiv/type-run.mkiv
index 0455d8966..0455d8966 100644
--- a/tex/context/base/type-run.mkiv
+++ b/tex/context/base/mkiv/type-run.mkiv
diff --git a/tex/context/base/type-set.mkiv b/tex/context/base/mkiv/type-set.mkiv
index e2d7071d4..e2d7071d4 100644
--- a/tex/context/base/type-set.mkiv
+++ b/tex/context/base/mkiv/type-set.mkiv
diff --git a/tex/context/base/type-siz.mkiv b/tex/context/base/mkiv/type-siz.mkiv
index d4c90b182..d4c90b182 100644
--- a/tex/context/base/type-siz.mkiv
+++ b/tex/context/base/mkiv/type-siz.mkiv
diff --git a/tex/context/base/type-tmf.mkiv b/tex/context/base/mkiv/type-tmf.mkiv
index 829b6baec..829b6baec 100644
--- a/tex/context/base/type-tmf.mkiv
+++ b/tex/context/base/mkiv/type-tmf.mkiv
diff --git a/tex/context/base/typo-bld.lua b/tex/context/base/mkiv/typo-bld.lua
index ade171c5d..ade171c5d 100644
--- a/tex/context/base/typo-bld.lua
+++ b/tex/context/base/mkiv/typo-bld.lua
diff --git a/tex/context/base/typo-bld.mkiv b/tex/context/base/mkiv/typo-bld.mkiv
index 621d81c52..621d81c52 100644
--- a/tex/context/base/typo-bld.mkiv
+++ b/tex/context/base/mkiv/typo-bld.mkiv
diff --git a/tex/context/base/typo-brk.lua b/tex/context/base/mkiv/typo-brk.lua
index 146694494..146694494 100644
--- a/tex/context/base/typo-brk.lua
+++ b/tex/context/base/mkiv/typo-brk.lua
diff --git a/tex/context/base/typo-brk.mkiv b/tex/context/base/mkiv/typo-brk.mkiv
index 3b463c06f..3b463c06f 100644
--- a/tex/context/base/typo-brk.mkiv
+++ b/tex/context/base/mkiv/typo-brk.mkiv
diff --git a/tex/context/base/typo-cap.lua b/tex/context/base/mkiv/typo-cap.lua
index 0eae3b2d9..0eae3b2d9 100644
--- a/tex/context/base/typo-cap.lua
+++ b/tex/context/base/mkiv/typo-cap.lua
diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/mkiv/typo-cap.mkiv
index 114532e4e..114532e4e 100644
--- a/tex/context/base/typo-cap.mkiv
+++ b/tex/context/base/mkiv/typo-cap.mkiv
diff --git a/tex/context/base/typo-chr.lua b/tex/context/base/mkiv/typo-chr.lua
index 041a73e1b..041a73e1b 100644
--- a/tex/context/base/typo-chr.lua
+++ b/tex/context/base/mkiv/typo-chr.lua
diff --git a/tex/context/base/typo-chr.mkiv b/tex/context/base/mkiv/typo-chr.mkiv
index dc0c68664..dc0c68664 100644
--- a/tex/context/base/typo-chr.mkiv
+++ b/tex/context/base/mkiv/typo-chr.mkiv
diff --git a/tex/context/base/typo-cln.lua b/tex/context/base/mkiv/typo-cln.lua
index bc11f944c..bc11f944c 100644
--- a/tex/context/base/typo-cln.lua
+++ b/tex/context/base/mkiv/typo-cln.lua
diff --git a/tex/context/base/typo-cln.mkiv b/tex/context/base/mkiv/typo-cln.mkiv
index 193198dc5..193198dc5 100644
--- a/tex/context/base/typo-cln.mkiv
+++ b/tex/context/base/mkiv/typo-cln.mkiv
diff --git a/tex/context/base/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv
index ebba94428..ebba94428 100644
--- a/tex/context/base/typo-del.mkiv
+++ b/tex/context/base/mkiv/typo-del.mkiv
diff --git a/tex/context/base/typo-dha.lua b/tex/context/base/mkiv/typo-dha.lua
index 30984a26c..30984a26c 100644
--- a/tex/context/base/typo-dha.lua
+++ b/tex/context/base/mkiv/typo-dha.lua
diff --git a/tex/context/base/typo-dig.lua b/tex/context/base/mkiv/typo-dig.lua
index 09c2f64ee..09c2f64ee 100644
--- a/tex/context/base/typo-dig.lua
+++ b/tex/context/base/mkiv/typo-dig.lua
diff --git a/tex/context/base/typo-dig.mkiv b/tex/context/base/mkiv/typo-dig.mkiv
index aa610b3c9..aa610b3c9 100644
--- a/tex/context/base/typo-dig.mkiv
+++ b/tex/context/base/mkiv/typo-dig.mkiv
diff --git a/tex/context/base/typo-dir.lua b/tex/context/base/mkiv/typo-dir.lua
index 482b7114d..482b7114d 100644
--- a/tex/context/base/typo-dir.lua
+++ b/tex/context/base/mkiv/typo-dir.lua
diff --git a/tex/context/base/typo-dir.mkiv b/tex/context/base/mkiv/typo-dir.mkiv
index 7290c8313..7290c8313 100644
--- a/tex/context/base/typo-dir.mkiv
+++ b/tex/context/base/mkiv/typo-dir.mkiv
diff --git a/tex/context/base/typo-drp.lua b/tex/context/base/mkiv/typo-drp.lua
index 9d6d645d0..9d6d645d0 100644
--- a/tex/context/base/typo-drp.lua
+++ b/tex/context/base/mkiv/typo-drp.lua
diff --git a/tex/context/base/typo-drp.mkiv b/tex/context/base/mkiv/typo-drp.mkiv
index 2520c3bfd..2520c3bfd 100644
--- a/tex/context/base/typo-drp.mkiv
+++ b/tex/context/base/mkiv/typo-drp.mkiv
diff --git a/tex/context/base/typo-dua.lua b/tex/context/base/mkiv/typo-dua.lua
index bbb071f55..bbb071f55 100644
--- a/tex/context/base/typo-dua.lua
+++ b/tex/context/base/mkiv/typo-dua.lua
diff --git a/tex/context/base/typo-dub.lua b/tex/context/base/mkiv/typo-dub.lua
index 2ee85ad7d..2ee85ad7d 100644
--- a/tex/context/base/typo-dub.lua
+++ b/tex/context/base/mkiv/typo-dub.lua
diff --git a/tex/context/base/typo-fln.lua b/tex/context/base/mkiv/typo-fln.lua
index 1e1a2c44a..1e1a2c44a 100644
--- a/tex/context/base/typo-fln.lua
+++ b/tex/context/base/mkiv/typo-fln.lua
diff --git a/tex/context/base/typo-fln.mkiv b/tex/context/base/mkiv/typo-fln.mkiv
index e883c57d2..e883c57d2 100644
--- a/tex/context/base/typo-fln.mkiv
+++ b/tex/context/base/mkiv/typo-fln.mkiv
diff --git a/tex/context/base/typo-ini.lua b/tex/context/base/mkiv/typo-ini.lua
index c45d29664..c45d29664 100644
--- a/tex/context/base/typo-ini.lua
+++ b/tex/context/base/mkiv/typo-ini.lua
diff --git a/tex/context/base/typo-ini.mkiv b/tex/context/base/mkiv/typo-ini.mkiv
index 1c2d6617a..1c2d6617a 100644
--- a/tex/context/base/typo-ini.mkiv
+++ b/tex/context/base/mkiv/typo-ini.mkiv
diff --git a/tex/context/base/typo-inj.lua b/tex/context/base/mkiv/typo-inj.lua
index 786c3c287..786c3c287 100644
--- a/tex/context/base/typo-inj.lua
+++ b/tex/context/base/mkiv/typo-inj.lua
diff --git a/tex/context/base/typo-inj.mkiv b/tex/context/base/mkiv/typo-inj.mkiv
index 59f35378f..59f35378f 100644
--- a/tex/context/base/typo-inj.mkiv
+++ b/tex/context/base/mkiv/typo-inj.mkiv
diff --git a/tex/context/base/typo-itc.lua b/tex/context/base/mkiv/typo-itc.lua
index 47783be49..47783be49 100644
--- a/tex/context/base/typo-itc.lua
+++ b/tex/context/base/mkiv/typo-itc.lua
diff --git a/tex/context/base/typo-itc.mkvi b/tex/context/base/mkiv/typo-itc.mkvi
index b0d2673cd..b0d2673cd 100644
--- a/tex/context/base/typo-itc.mkvi
+++ b/tex/context/base/mkiv/typo-itc.mkvi
diff --git a/tex/context/base/typo-itm.mkiv b/tex/context/base/mkiv/typo-itm.mkiv
index 0bb8170c7..0bb8170c7 100644
--- a/tex/context/base/typo-itm.mkiv
+++ b/tex/context/base/mkiv/typo-itm.mkiv
diff --git a/tex/context/base/typo-krn.lua b/tex/context/base/mkiv/typo-krn.lua
index cdb0a786c..cdb0a786c 100644
--- a/tex/context/base/typo-krn.lua
+++ b/tex/context/base/mkiv/typo-krn.lua
diff --git a/tex/context/base/typo-krn.mkiv b/tex/context/base/mkiv/typo-krn.mkiv
index 6d6126542..6d6126542 100644
--- a/tex/context/base/typo-krn.mkiv
+++ b/tex/context/base/mkiv/typo-krn.mkiv
diff --git a/tex/context/base/typo-lan.lua b/tex/context/base/mkiv/typo-lan.lua
index c42d2119e..c42d2119e 100644
--- a/tex/context/base/typo-lan.lua
+++ b/tex/context/base/mkiv/typo-lan.lua
diff --git a/tex/context/base/typo-lan.mkiv b/tex/context/base/mkiv/typo-lan.mkiv
index 8b633957b..8b633957b 100644
--- a/tex/context/base/typo-lan.mkiv
+++ b/tex/context/base/mkiv/typo-lan.mkiv
diff --git a/tex/context/base/typo-lig.mkiv b/tex/context/base/mkiv/typo-lig.mkiv
index 6171441d6..6171441d6 100644
--- a/tex/context/base/typo-lig.mkiv
+++ b/tex/context/base/mkiv/typo-lig.mkiv
diff --git a/tex/context/base/typo-lin.lua b/tex/context/base/mkiv/typo-lin.lua
index 001bc94cf..001bc94cf 100644
--- a/tex/context/base/typo-lin.lua
+++ b/tex/context/base/mkiv/typo-lin.lua
diff --git a/tex/context/base/typo-lin.mkiv b/tex/context/base/mkiv/typo-lin.mkiv
index eba08b4c8..eba08b4c8 100644
--- a/tex/context/base/typo-lin.mkiv
+++ b/tex/context/base/mkiv/typo-lin.mkiv
diff --git a/tex/context/base/typo-man.lua b/tex/context/base/mkiv/typo-man.lua
index 6c6d7926f..6c6d7926f 100644
--- a/tex/context/base/typo-man.lua
+++ b/tex/context/base/mkiv/typo-man.lua
diff --git a/tex/context/base/typo-mar.lua b/tex/context/base/mkiv/typo-mar.lua
index 37732f066..37732f066 100644
--- a/tex/context/base/typo-mar.lua
+++ b/tex/context/base/mkiv/typo-mar.lua
diff --git a/tex/context/base/typo-mar.mkiv b/tex/context/base/mkiv/typo-mar.mkiv
index 90ccd46e2..90ccd46e2 100644
--- a/tex/context/base/typo-mar.mkiv
+++ b/tex/context/base/mkiv/typo-mar.mkiv
diff --git a/tex/context/base/typo-pag.lua b/tex/context/base/mkiv/typo-pag.lua
index 355becff6..355becff6 100644
--- a/tex/context/base/typo-pag.lua
+++ b/tex/context/base/mkiv/typo-pag.lua
diff --git a/tex/context/base/typo-pag.mkiv b/tex/context/base/mkiv/typo-pag.mkiv
index 30d2b51b7..30d2b51b7 100644
--- a/tex/context/base/typo-pag.mkiv
+++ b/tex/context/base/mkiv/typo-pag.mkiv
diff --git a/tex/context/base/typo-par.mkiv b/tex/context/base/mkiv/typo-par.mkiv
index 8572f31b8..8572f31b8 100644
--- a/tex/context/base/typo-par.mkiv
+++ b/tex/context/base/mkiv/typo-par.mkiv
diff --git a/tex/context/base/typo-prc.lua b/tex/context/base/mkiv/typo-prc.lua
index cde66df00..cde66df00 100644
--- a/tex/context/base/typo-prc.lua
+++ b/tex/context/base/mkiv/typo-prc.lua
diff --git a/tex/context/base/typo-prc.mkvi b/tex/context/base/mkiv/typo-prc.mkvi
index 49a165696..49a165696 100644
--- a/tex/context/base/typo-prc.mkvi
+++ b/tex/context/base/mkiv/typo-prc.mkvi
diff --git a/tex/context/base/typo-rep.lua b/tex/context/base/mkiv/typo-rep.lua
index d95eff68e..d95eff68e 100644
--- a/tex/context/base/typo-rep.lua
+++ b/tex/context/base/mkiv/typo-rep.lua
diff --git a/tex/context/base/typo-rep.mkiv b/tex/context/base/mkiv/typo-rep.mkiv
index c1146997e..c1146997e 100644
--- a/tex/context/base/typo-rep.mkiv
+++ b/tex/context/base/mkiv/typo-rep.mkiv
diff --git a/tex/context/base/typo-scr.mkiv b/tex/context/base/mkiv/typo-scr.mkiv
index 6249c390a..6249c390a 100644
--- a/tex/context/base/typo-scr.mkiv
+++ b/tex/context/base/mkiv/typo-scr.mkiv
diff --git a/tex/context/base/typo-spa.lua b/tex/context/base/mkiv/typo-spa.lua
index 519ba3f34..519ba3f34 100644
--- a/tex/context/base/typo-spa.lua
+++ b/tex/context/base/mkiv/typo-spa.lua
diff --git a/tex/context/base/typo-spa.mkiv b/tex/context/base/mkiv/typo-spa.mkiv
index 2e3e71bf3..2e3e71bf3 100644
--- a/tex/context/base/typo-spa.mkiv
+++ b/tex/context/base/mkiv/typo-spa.mkiv
diff --git a/tex/context/base/typo-sus.lua b/tex/context/base/mkiv/typo-sus.lua
index 2f1949ff0..2f1949ff0 100644
--- a/tex/context/base/typo-sus.lua
+++ b/tex/context/base/mkiv/typo-sus.lua
diff --git a/tex/context/base/typo-sus.mkiv b/tex/context/base/mkiv/typo-sus.mkiv
index fe44e6327..fe44e6327 100644
--- a/tex/context/base/typo-sus.mkiv
+++ b/tex/context/base/mkiv/typo-sus.mkiv
diff --git a/tex/context/base/typo-tal.lua b/tex/context/base/mkiv/typo-tal.lua
index 2594b7298..2594b7298 100644
--- a/tex/context/base/typo-tal.lua
+++ b/tex/context/base/mkiv/typo-tal.lua
diff --git a/tex/context/base/typo-tal.mkiv b/tex/context/base/mkiv/typo-tal.mkiv
index 570f1a1f5..570f1a1f5 100644
--- a/tex/context/base/typo-tal.mkiv
+++ b/tex/context/base/mkiv/typo-tal.mkiv
diff --git a/tex/context/base/typo-txt.mkvi b/tex/context/base/mkiv/typo-txt.mkvi
index 7562fe70c..7562fe70c 100644
--- a/tex/context/base/typo-txt.mkvi
+++ b/tex/context/base/mkiv/typo-txt.mkvi
diff --git a/tex/context/base/typo-wrp.lua b/tex/context/base/mkiv/typo-wrp.lua
index 394e15090..394e15090 100644
--- a/tex/context/base/typo-wrp.lua
+++ b/tex/context/base/mkiv/typo-wrp.lua
diff --git a/tex/context/base/typo-wrp.mkiv b/tex/context/base/mkiv/typo-wrp.mkiv
index 4b18785bd..4b18785bd 100644
--- a/tex/context/base/typo-wrp.mkiv
+++ b/tex/context/base/mkiv/typo-wrp.mkiv
diff --git a/tex/context/base/unic-ini.lua b/tex/context/base/mkiv/unic-ini.lua
index 132c92efa..132c92efa 100644
--- a/tex/context/base/unic-ini.lua
+++ b/tex/context/base/mkiv/unic-ini.lua
diff --git a/tex/context/base/unic-ini.mkiv b/tex/context/base/mkiv/unic-ini.mkiv
index 13ad4bdb9..13ad4bdb9 100644
--- a/tex/context/base/unic-ini.mkiv
+++ b/tex/context/base/mkiv/unic-ini.mkiv
diff --git a/tex/context/base/util-deb.lua b/tex/context/base/mkiv/util-deb.lua
index ee732b3b5..ee732b3b5 100644
--- a/tex/context/base/util-deb.lua
+++ b/tex/context/base/mkiv/util-deb.lua
diff --git a/tex/context/base/util-dim.lua b/tex/context/base/mkiv/util-dim.lua
index 2bdb870e7..2bdb870e7 100644
--- a/tex/context/base/util-dim.lua
+++ b/tex/context/base/mkiv/util-dim.lua
diff --git a/tex/context/base/util-env.lua b/tex/context/base/mkiv/util-env.lua
index b72226900..b72226900 100644
--- a/tex/context/base/util-env.lua
+++ b/tex/context/base/mkiv/util-env.lua
diff --git a/tex/context/base/util-fil.lua b/tex/context/base/mkiv/util-fil.lua
index 42bbe37b3..42bbe37b3 100644
--- a/tex/context/base/util-fil.lua
+++ b/tex/context/base/mkiv/util-fil.lua
diff --git a/tex/context/base/util-fmt.lua b/tex/context/base/mkiv/util-fmt.lua
index 371a5dfce..371a5dfce 100644
--- a/tex/context/base/util-fmt.lua
+++ b/tex/context/base/mkiv/util-fmt.lua
diff --git a/tex/context/base/util-jsn.lua b/tex/context/base/mkiv/util-jsn.lua
index bbe25d89d..bbe25d89d 100644
--- a/tex/context/base/util-jsn.lua
+++ b/tex/context/base/mkiv/util-jsn.lua
diff --git a/tex/context/base/util-lib-imp-gm.lua b/tex/context/base/mkiv/util-lib-imp-gm.lua
index 4c5254721..4c5254721 100644
--- a/tex/context/base/util-lib-imp-gm.lua
+++ b/tex/context/base/mkiv/util-lib-imp-gm.lua
diff --git a/tex/context/base/util-lib-imp-gs.lua b/tex/context/base/mkiv/util-lib-imp-gs.lua
index 8fd2dd458..8fd2dd458 100644
--- a/tex/context/base/util-lib-imp-gs.lua
+++ b/tex/context/base/mkiv/util-lib-imp-gs.lua
diff --git a/tex/context/base/util-lib.lua b/tex/context/base/mkiv/util-lib.lua
index 2601b2e57..2601b2e57 100644
--- a/tex/context/base/util-lib.lua
+++ b/tex/context/base/mkiv/util-lib.lua
diff --git a/tex/context/base/util-lua.lua b/tex/context/base/mkiv/util-lua.lua
index e1dcdc94d..e1dcdc94d 100644
--- a/tex/context/base/util-lua.lua
+++ b/tex/context/base/mkiv/util-lua.lua
diff --git a/tex/context/base/util-mrg.lua b/tex/context/base/mkiv/util-mrg.lua
index 690188ef8..690188ef8 100644
--- a/tex/context/base/util-mrg.lua
+++ b/tex/context/base/mkiv/util-mrg.lua
diff --git a/tex/context/base/util-pck.lua b/tex/context/base/mkiv/util-pck.lua
index 83b85cd94..83b85cd94 100644
--- a/tex/context/base/util-pck.lua
+++ b/tex/context/base/mkiv/util-pck.lua
diff --git a/tex/context/base/util-prs.lua b/tex/context/base/mkiv/util-prs.lua
index 01138f1bb..01138f1bb 100644
--- a/tex/context/base/util-prs.lua
+++ b/tex/context/base/mkiv/util-prs.lua
diff --git a/tex/context/base/util-ran.lua b/tex/context/base/mkiv/util-ran.lua
index 50d0a7082..50d0a7082 100644
--- a/tex/context/base/util-ran.lua
+++ b/tex/context/base/mkiv/util-ran.lua
diff --git a/tex/context/base/util-sac.lua b/tex/context/base/mkiv/util-sac.lua
index 8a12e7cf0..8a12e7cf0 100644
--- a/tex/context/base/util-sac.lua
+++ b/tex/context/base/mkiv/util-sac.lua
diff --git a/tex/context/base/util-sbx.lua b/tex/context/base/mkiv/util-sbx.lua
index 260e8b3b5..260e8b3b5 100644
--- a/tex/context/base/util-sbx.lua
+++ b/tex/context/base/mkiv/util-sbx.lua
diff --git a/tex/context/base/util-sci.lua b/tex/context/base/mkiv/util-sci.lua
index 43d873b63..43d873b63 100644
--- a/tex/context/base/util-sci.lua
+++ b/tex/context/base/mkiv/util-sci.lua
diff --git a/tex/context/base/util-seq.lua b/tex/context/base/mkiv/util-seq.lua
index 32fe59096..32fe59096 100644
--- a/tex/context/base/util-seq.lua
+++ b/tex/context/base/mkiv/util-seq.lua
diff --git a/tex/context/base/util-soc.lua b/tex/context/base/mkiv/util-soc.lua
index 3a52ee86d..3a52ee86d 100644
--- a/tex/context/base/util-soc.lua
+++ b/tex/context/base/mkiv/util-soc.lua
diff --git a/tex/context/base/util-sql-imp-client.lua b/tex/context/base/mkiv/util-sql-imp-client.lua
index 9a0fbc299..9a0fbc299 100644
--- a/tex/context/base/util-sql-imp-client.lua
+++ b/tex/context/base/mkiv/util-sql-imp-client.lua
diff --git a/tex/context/base/util-sql-imp-library.lua b/tex/context/base/mkiv/util-sql-imp-library.lua
index 15754e26a..15754e26a 100644
--- a/tex/context/base/util-sql-imp-library.lua
+++ b/tex/context/base/mkiv/util-sql-imp-library.lua
diff --git a/tex/context/base/util-sql-imp-swiglib.lua b/tex/context/base/mkiv/util-sql-imp-swiglib.lua
index af7012392..af7012392 100644
--- a/tex/context/base/util-sql-imp-swiglib.lua
+++ b/tex/context/base/mkiv/util-sql-imp-swiglib.lua
diff --git a/tex/context/base/util-sql-loggers.lua b/tex/context/base/mkiv/util-sql-loggers.lua
index ceb1ff75c..ceb1ff75c 100644
--- a/tex/context/base/util-sql-loggers.lua
+++ b/tex/context/base/mkiv/util-sql-loggers.lua
diff --git a/tex/context/base/util-sql-sessions.lua b/tex/context/base/mkiv/util-sql-sessions.lua
index 76bb91962..76bb91962 100644
--- a/tex/context/base/util-sql-sessions.lua
+++ b/tex/context/base/mkiv/util-sql-sessions.lua
diff --git a/tex/context/base/util-sql-tickets.lua b/tex/context/base/mkiv/util-sql-tickets.lua
index 5e958299d..5e958299d 100644
--- a/tex/context/base/util-sql-tickets.lua
+++ b/tex/context/base/mkiv/util-sql-tickets.lua
diff --git a/tex/context/base/util-sql-tracers.lua b/tex/context/base/mkiv/util-sql-tracers.lua
index c210755f1..44e32d256 100644
--- a/tex/context/base/util-sql-tracers.lua
+++ b/tex/context/base/mkiv/util-sql-tracers.lua
@@ -12,6 +12,8 @@ sql.tracers   = tracers
 
 sql.setmethod("swiglib")
 
+local gsub, lower = string.gsub, string.lower
+
 local t_names = {
     mysql = [[SHOW TABLES FROM `%database%`]],
     mssql = [[SELECT table_name FROM %database%.information_schema.tables;]],
@@ -51,7 +53,12 @@ function sql.tracers.gettables(presets)
             }
             if #results > 0 then
                 for i=1,#results do
-                    results[i] = table.loweredkeys(results[i])
+                    local result = table.loweredkeys(results[i])
+                    -- ms cleanup
+                    result.default = gsub(result.default,"^[%(']+(.-)[%)']+$","%1")
+                    result.null    = lower(result.null)
+                    --
+                    results[i] = result
                 end
                 tables[name] = results
             else
diff --git a/tex/context/base/util-sql-users.lua b/tex/context/base/mkiv/util-sql-users.lua
index a1f433946..a1f433946 100644
--- a/tex/context/base/util-sql-users.lua
+++ b/tex/context/base/mkiv/util-sql-users.lua
diff --git a/tex/context/base/util-sql.lua b/tex/context/base/mkiv/util-sql.lua
index 84cbb1692..84cbb1692 100644
--- a/tex/context/base/util-sql.lua
+++ b/tex/context/base/mkiv/util-sql.lua
diff --git a/tex/context/base/util-sta.lua b/tex/context/base/mkiv/util-sta.lua
index 27ab5a624..27ab5a624 100644
--- a/tex/context/base/util-sta.lua
+++ b/tex/context/base/mkiv/util-sta.lua
diff --git a/tex/context/base/util-sto.lua b/tex/context/base/mkiv/util-sto.lua
index d21267d7a..d21267d7a 100644
--- a/tex/context/base/util-sto.lua
+++ b/tex/context/base/mkiv/util-sto.lua
diff --git a/tex/context/base/util-str.lua b/tex/context/base/mkiv/util-str.lua
index 95534c8d8..95534c8d8 100644
--- a/tex/context/base/util-str.lua
+++ b/tex/context/base/mkiv/util-str.lua
diff --git a/tex/context/base/util-tab.lua b/tex/context/base/mkiv/util-tab.lua
index d6f3d6731..d6f3d6731 100644
--- a/tex/context/base/util-tab.lua
+++ b/tex/context/base/mkiv/util-tab.lua
diff --git a/tex/context/base/util-tpl.lua b/tex/context/base/mkiv/util-tpl.lua
index 468dd429c..468dd429c 100644
--- a/tex/context/base/util-tpl.lua
+++ b/tex/context/base/mkiv/util-tpl.lua
diff --git a/tex/context/base/util-you.lua b/tex/context/base/mkiv/util-you.lua
index 79a0e83e7..79a0e83e7 100644
--- a/tex/context/base/util-you.lua
+++ b/tex/context/base/mkiv/util-you.lua
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
deleted file mode 100644
index aca2ec5cd..000000000
--- a/tex/context/base/status-files.pdf
+++ /dev/null
diff --git a/tex/context/base/x-dir-05.mkiv b/tex/context/base/x-dir-05.mkiv
deleted file mode 100644
index 379b3220a..000000000
--- a/tex/context/base/x-dir-05.mkiv
+++ /dev/null
@@ -1,74 +0,0 @@
-%D \module
-%D   [      file=x-dir-05,
-%D        version=2003.05.10, % around that time -)
-%D          title=\CONTEXT\ Directory Handling,
-%D       subtitle=Access,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\setvariables
-  [filestate]
-  [name=,
-   base=,
-   type=,
-   size=,
-   permissions=,
-   date=]
-
-% \savefilestate[zip-latest][context/latest/cont-#2.zip]%
-
-% TODO: move to module namespace
-
-\startluacode
-    local filestates = { }
-    function commands.savefilestate(tag,name)
-        if not filestates[tag] then
-            local attr = lfs.attributes(name)
-            if attr then attr.name = name end
-            filestates[tag] = attr
-        end
-    end
-    function commands.getfilestatevariable(tag,name)
-        local fs = filestates[tag]
-        if fs then
-            local value
-            if name == "base" then
-                value = file.basename(fs.name)
-            elseif name == "type" then
-                value = file.extname(fs.name)
-            elseif name == "date" then
-                value = os.date("%Y-%m-%d %H:%M",fs.modification)
-            else
-                value = fs[name] or ""
-            end
-            context.sprint(tex.vrbcatcodes,value)
-        end
-    end
-\stopluacode
-
-\def\getfilestatevariable#1#2%
-  {\ctxcommand{getfilestatevariable("#1","#2")}}
-
-\def\savefilestate
-  {\dodoubleargument\dosavefilestate}
-
-\def\dosavefilestate[#1][#2]%
-  {\ctxcommand{savefilestate("#1","#2")}%
-   \setxvariables
-     [#1]
-     [name={#2},
-      base=\getfilestatevariable{#1}{base},
-      type=\getfilestatevariable{#1}{type},
-      size=\getfilestatevariable{#1}{size},
-      date=\getfilestatevariable{#1}{date},
-      permissions=\getfilestatevariable{#1}{permissions}]}
-
-\def\getfilestate#1% old one
-  {\savefilestate[filestate][#1]}
-
-\endinput
diff --git a/tex/context/base/x-xtag.mkiv b/tex/context/base/x-xtag.mkiv
deleted file mode 100644
index ab95c567e..000000000
--- a/tex/context/base/x-xtag.mkiv
+++ /dev/null
@@ -1,90 +0,0 @@
-%D \module
-%D   [       file=x-xtag,
-%D        version=2009.09.23,
-%D          title=\CONTEXT\ Modules,
-%D       subtitle=\XML\ stream handler,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Here we load the \MKII\ (mostly) streaming \XML\ parser. We
-%D define a couple of catcode regimes first.
-
-\endinput
-
-\writestatus{xtag}{this module is obsolete, use the mkiv-xml features or use mkii instead}
-
-%D Well, at this time (2011.12.28) I'm not sure if this code still works in
-%D \MKIV. But in any case we move snippets here that are only needed for old
-%D \MKII\ code.
-
-\unprotect
-
-\newif\ifforcefileexpansion % handy for document level overload
-
-\def\installexpander#1#2#3% changed, no longer \convert..\to...
-  {\setvalue{\s!do\c!expansion#1l}{#2}%
-   \setvalue{\s!do\c!expansion#1g}{#3}}%
-
-\def\doconvertexpanded#1#2#3% #4 % [l|g] \cs {kind} {data}
-  {\csname   % that we assign all exp a value
-     \s!do\c!expansion
-     \ifforcefileexpansion
-       \v!yes
-     \else\ifcsname\s!do\c!expansion#3#1\endcsname
-       #3%
-     \else
-       \s!default
-     \fi\fi
-     #1%
-   \endcsname#2}% #3
-
-\def\defconvertexpanded {\doconvertexpanded l}
-\def\gdefconvertexpanded{\doconvertexpanded g}
-
-\installexpander\v!command \defconvertedcommand  \gdefconvertedcommand
-\installexpander\s!default \defconvertedargument \gdefconvertedargument
-\installexpander\empty     \defconvertedargument \gdefconvertedargument
-\installexpander\v!no      \defconvertedargument \gdefconvertedargument
-\installexpander\v!yes     \defconvertedmeaning  \gdefconvertedmeaning
-\installexpander\v!yes     \defconvertedmeaning  \gdefconvertedmeaning
-\installexpander\v!strict  \defreducedargument   \gdefreducedargument
-\installexpander {utf}     \defreducedtoutf      \gdefreducedtoutf
-
-\def\dodefconvertedmeaning#1#2#3% watch the double expansion !
-  {\bgroup
-     \xdef\@@globalexpanded{#3}%
-     \xdef\@@globalexpanded{\@@globalexpanded}%
-   \egroup
-   #1#2\@@globalexpanded}
-
-\def\defconvertedmeaning {\dodefconvertedmeaning\defconvertedcommand}
-\def\gdefconvertedmeaning{\dodefconvertedmeaning\gdefconvertedcommand}
-
-\def\dodefreducedargument#1#2#3%
-  {\begingroup
-   \reducetocoding[raw]%
-   \edef\ascii{#3}%
-   \expandafter\endgroup\expandafter#1\expandafter#2\expandafter{\ascii}}
-
-\def\defreducedargument {\dodefreducedargument\edef}
-\def\gdefreducedargument{\dodefreducedargument\xdef}
-
-\protect
-
-%D The \XML\ modules.
-
-\loadmarkfile{catc-xml}
-
-\loadcorefile{xtag-ini.mkii}
-\loadcorefile{xtag-ext.mkii}
-\loadcorefile{xtag-exp.mkii}
-\loadcorefile{xtag-pre.mkii} % has old encoding code
-\loadcorefile{xtag-xsd.mkii} % will go away (stub anyway)
-\loadcorefile{xtag-rng.mkii} % will go away (stub anyway)
-
-\endinput
diff --git a/tex/context/bib/sample.bib b/tex/context/bib/common/sample.bib
index 4bb71d3a7..4bb71d3a7 100644
--- a/tex/context/bib/sample.bib
+++ b/tex/context/bib/common/sample.bib
diff --git a/tex/context/bib/bibl-ams.tex b/tex/context/bib/mkii/bibl-ams.tex
index 37bcf253f..37bcf253f 100644
--- a/tex/context/bib/bibl-ams.tex
+++ b/tex/context/bib/mkii/bibl-ams.tex
diff --git a/tex/context/bib/bibl-apa-de.tex b/tex/context/bib/mkii/bibl-apa-de.tex
index afeebd260..afeebd260 100644
--- a/tex/context/bib/bibl-apa-de.tex
+++ b/tex/context/bib/mkii/bibl-apa-de.tex
diff --git a/tex/context/bib/bibl-apa-fr.tex b/tex/context/bib/mkii/bibl-apa-fr.tex
index 654a36441..654a36441 100644
--- a/tex/context/bib/bibl-apa-fr.tex
+++ b/tex/context/bib/mkii/bibl-apa-fr.tex
diff --git a/tex/context/bib/bibl-apa-it.tex b/tex/context/bib/mkii/bibl-apa-it.tex
index ebf03313a..ebf03313a 100644
--- a/tex/context/bib/bibl-apa-it.tex
+++ b/tex/context/bib/mkii/bibl-apa-it.tex
diff --git a/tex/context/bib/bibl-apa.tex b/tex/context/bib/mkii/bibl-apa.tex
index b0403e542..b0403e542 100644
--- a/tex/context/bib/bibl-apa.tex
+++ b/tex/context/bib/mkii/bibl-apa.tex
diff --git a/tex/context/bib/bibl-aps.tex b/tex/context/bib/mkii/bibl-aps.tex
index 39d3bd7d4..39d3bd7d4 100644
--- a/tex/context/bib/bibl-aps.tex
+++ b/tex/context/bib/mkii/bibl-aps.tex
diff --git a/tex/context/bib/bibl-num-fr.tex b/tex/context/bib/mkii/bibl-num-fr.tex
index c4271fb7f..c4271fb7f 100644
--- a/tex/context/bib/bibl-num-fr.tex
+++ b/tex/context/bib/mkii/bibl-num-fr.tex
diff --git a/tex/context/bib/bibl-num.tex b/tex/context/bib/mkii/bibl-num.tex
index 3c72d975a..3c72d975a 100644
--- a/tex/context/bib/bibl-num.tex
+++ b/tex/context/bib/mkii/bibl-num.tex
diff --git a/tex/context/bib/bibl-ssa.tex b/tex/context/bib/mkii/bibl-ssa.tex
index b93bd1b68..b93bd1b68 100644
--- a/tex/context/bib/bibl-ssa.tex
+++ b/tex/context/bib/mkii/bibl-ssa.tex
diff --git a/tex/context/extra/mag-0000.tex b/tex/context/extra/mag-0000.tex
deleted file mode 100644
index baad957b8..000000000
--- a/tex/context/extra/mag-0000.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-% content=tex
-%
-% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa
-
-\usemodule[mag-01] 
-
-\setvariables
-  [magazine]
-  [title={Introduction},
-   author=Hans Hagen,
-   affiliation=PRAGMA ADE, 
-   date=Januari 2003,
-   number=0]
-
-\startbuffer[abstract] 
-  This is the zero issue of a semi periodical. The
-  associated style can be used by \CONTEXT\ users to
-  typeset and publish their own issues. 
-\stopbuffer
-
-\starttext \setups [titlepage] \setups [title] 
-
-\setupheadertexts[welcome]
-
-This is the zero issue of a range of \CONTEXT\ related
-publications, in most cases short introductions to new
-functionality. The style may be used by users for providing
-similar documents, but preferably not for other purposes,
-since it may confuse readers in their expectations.  
-
-We've chosen a layout which is more functional than
-beautiful. This layout provides several text areas: headers
-and footers, margins and edges as well as a main text area.
-The surrounding (gray) makes the main page (which is
-slightly smaller than A4) stand out and is suitable for
-viewing in spread mode. 
-
-The documents produced at \PRAGMA\ are called {\bf This
-Way}, user documents gets the title {\bf My Way}. The
-\PRAGMA\ issues are numbered. We strongly advise you not to
-use the \type {mag-} prefix for your issues, since this may
-lead to clashes with files distributed by \PRAGMA. 
-
-\setups [listing] \setups [lastpage] \stoptext
diff --git a/tex/context/extra/setup-qr.tex b/tex/context/extra/setup-qr.tex
deleted file mode 100644
index 466f5e68a..000000000
--- a/tex/context/extra/setup-qr.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-% output=pdftex interface=en
-
-%D \module
-%D   [       file=setup-qr,
-%D        version=1997.07.22,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Quick Reference Document / Efficient,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This is a stripped down version of the good old quick
-%D reference document. This version is more compact and
-%D therefore better suited for local processing and printing.
-%D The slightly more fancy version can be fetched from the
-%D \CONTEXT\ web site.
-
-\dontcomplain \silentmode
-
-\unprotect
-
-\setupbodyfont
-  [9pt]
-
-\setuplayout
-  [\c!rugwit=1cm,
-   \c!kopwit=1cm,
-   \c!hoofd=0cm,
-   \c!voet=0cm,
-   \c!breedte=\v!midden,
-   \c!hoogte=\v!midden]
-
-\readfile{setupa} {} {}
-
-\stelsetupin
-  [\c!criterium=\v!alles,
-   \c!verwijzing=0]
-
-\setupframedtexts
-  [setuptext]
-  [\c!kader=\v!aan]
-
-\readfile{setupb} {} {}
-
-\starttekst
-
-\startmakeup[\v!standaard]
-  \setupalign[\v!midden]
-  \definedfont[RegularBold at 60pt]\setstrut
-  \strut Con\TeX t \par
-  \vskip24pt
-  \definedfont[RegularBold at 45pt]\setstrut
-  \startinterface dutch    \strut commando's     \par \stopinterface
-  \startinterface english  \strut commands       \par \stopinterface
-  \startinterface german   \strut befehle        \par \stopinterface
-  \startinterface czech    \strut prikaz\'y      \par \stopinterface
-  \startinterface italian  \strut comandi        \par \stopinterface
-  \startinterface romanian \strut comenzile      \par \stopinterface
-  \vfill
-  \strut \currentdate \par
-  \startinterface dutch    \strut nederlands     \par \stopinterface
-  \startinterface english  \strut english        \par \stopinterface
-  \startinterface german   \strut deutsch        \par \stopinterface
-  \startinterface czech    \strut \^cesk\'y      \par \stopinterface
-  \startinterface italian  \strut italiano       \par \stopinterface
-  \startinterface romanian \strut rom\^{a}n\u{a} \par \stopinterface
-\stopmakeup
-
-\protect
-
-\placesetup
-
-\stoptekst
\ No newline at end of file
diff --git a/tex/context/base/type-buy.mkii b/tex/context/fonts/mkii/type-buy.mkii
index b8518acb0..b8518acb0 100644
--- a/tex/context/base/type-buy.mkii
+++ b/tex/context/fonts/mkii/type-buy.mkii
diff --git a/tex/context/base/type-cbg.mkii b/tex/context/fonts/mkii/type-cbg.mkii
index a45a71d4e..a45a71d4e 100644
--- a/tex/context/base/type-cbg.mkii
+++ b/tex/context/fonts/mkii/type-cbg.mkii
diff --git a/tex/context/base/type-cow.mkii b/tex/context/fonts/mkii/type-cow.mkii
index f46ac968b..f46ac968b 100644
--- a/tex/context/base/type-cow.mkii
+++ b/tex/context/fonts/mkii/type-cow.mkii
diff --git a/tex/context/base/type-exp.mkii b/tex/context/fonts/mkii/type-exp.mkii
index c7c6e4b45..c7c6e4b45 100644
--- a/tex/context/base/type-exp.mkii
+++ b/tex/context/fonts/mkii/type-exp.mkii
diff --git a/tex/context/base/type-fsf.mkii b/tex/context/fonts/mkii/type-fsf.mkii
index 6782d3dcf..6782d3dcf 100644
--- a/tex/context/base/type-fsf.mkii
+++ b/tex/context/fonts/mkii/type-fsf.mkii
diff --git a/tex/context/base/type-ghz.mkii b/tex/context/fonts/mkii/type-ghz.mkii
index 3778cd964..3778cd964 100644
--- a/tex/context/base/type-ghz.mkii
+++ b/tex/context/fonts/mkii/type-ghz.mkii
diff --git a/tex/context/base/type-hgz.mkii b/tex/context/fonts/mkii/type-hgz.mkii
index 4d3e495b0..4d3e495b0 100644
--- a/tex/context/base/type-hgz.mkii
+++ b/tex/context/fonts/mkii/type-hgz.mkii
diff --git a/tex/context/base/type-mac.mkii b/tex/context/fonts/mkii/type-mac.mkii
index e8abf09b9..e8abf09b9 100644
--- a/tex/context/base/type-mac.mkii
+++ b/tex/context/fonts/mkii/type-mac.mkii
diff --git a/tex/context/base/type-msw.mkii b/tex/context/fonts/mkii/type-msw.mkii
index 26ec190cb..26ec190cb 100644
--- a/tex/context/base/type-msw.mkii
+++ b/tex/context/fonts/mkii/type-msw.mkii
diff --git a/tex/context/base/type-pre.mkii b/tex/context/fonts/mkii/type-pre.mkii
index 99db52c2f..99db52c2f 100644
--- a/tex/context/base/type-pre.mkii
+++ b/tex/context/fonts/mkii/type-pre.mkii
diff --git a/tex/context/base/type-win.mkii b/tex/context/fonts/mkii/type-win.mkii
index ae6909820..ae6909820 100644
--- a/tex/context/base/type-win.mkii
+++ b/tex/context/fonts/mkii/type-win.mkii
diff --git a/tex/context/base/type-xtx.mkii b/tex/context/fonts/mkii/type-xtx.mkii
index 3c5b06d9e..3c5b06d9e 100644
--- a/tex/context/base/type-xtx.mkii
+++ b/tex/context/fonts/mkii/type-xtx.mkii
diff --git a/tex/context/fonts/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg
index 112a3f9a7..112a3f9a7 100644
--- a/tex/context/fonts/antykwa-math.lfg
+++ b/tex/context/fonts/mkiv/antykwa-math.lfg
diff --git a/tex/context/fonts/antykwapoltawskiego.lfg b/tex/context/fonts/mkiv/antykwapoltawskiego.lfg
index 794b9f407..794b9f407 100644
--- a/tex/context/fonts/antykwapoltawskiego.lfg
+++ b/tex/context/fonts/mkiv/antykwapoltawskiego.lfg
diff --git a/tex/context/fonts/asana-math.lfg b/tex/context/fonts/mkiv/asana-math.lfg
index 5b47b3ff8..5b47b3ff8 100644
--- a/tex/context/fonts/asana-math.lfg
+++ b/tex/context/fonts/mkiv/asana-math.lfg
diff --git a/tex/context/fonts/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg
index 6415069e6..6415069e6 100644
--- a/tex/context/fonts/cambria-math.lfg
+++ b/tex/context/fonts/mkiv/cambria-math.lfg
diff --git a/tex/context/fonts/cambria.lfg b/tex/context/fonts/mkiv/cambria.lfg
index 04211009b..04211009b 100644
--- a/tex/context/fonts/cambria.lfg
+++ b/tex/context/fonts/mkiv/cambria.lfg
diff --git a/tex/context/fonts/cc-icons.lfg b/tex/context/fonts/mkiv/cc-icons.lfg
index fd0759b78..fd0759b78 100644
--- a/tex/context/fonts/cc-icons.lfg
+++ b/tex/context/fonts/mkiv/cc-icons.lfg
diff --git a/tex/context/fonts/ccicons.lfg b/tex/context/fonts/mkiv/ccicons.lfg
index b79b3fb93..b79b3fb93 100644
--- a/tex/context/fonts/ccicons.lfg
+++ b/tex/context/fonts/mkiv/ccicons.lfg
diff --git a/tex/context/fonts/demo.lfg b/tex/context/fonts/mkiv/demo.lfg
index 06c59e644..06c59e644 100644
--- a/tex/context/fonts/demo.lfg
+++ b/tex/context/fonts/mkiv/demo.lfg
diff --git a/tex/context/fonts/dingbats.lfg b/tex/context/fonts/mkiv/dingbats.lfg
index b6bf3880f..b6bf3880f 100644
--- a/tex/context/fonts/dingbats.lfg
+++ b/tex/context/fonts/mkiv/dingbats.lfg
diff --git a/tex/context/fonts/ebgaramond.lfg b/tex/context/fonts/mkiv/ebgaramond.lfg
index 43cc13c51..43cc13c51 100644
--- a/tex/context/fonts/ebgaramond.lfg
+++ b/tex/context/fonts/mkiv/ebgaramond.lfg
diff --git a/tex/context/fonts/euler-math.lfg b/tex/context/fonts/mkiv/euler-math.lfg
index da7647c53..da7647c53 100644
--- a/tex/context/fonts/euler-math.lfg
+++ b/tex/context/fonts/mkiv/euler-math.lfg
diff --git a/tex/context/fonts/hanbatanglvt.lfg b/tex/context/fonts/mkiv/hanbatanglvt.lfg
index 333743348..333743348 100644
--- a/tex/context/fonts/hanbatanglvt.lfg
+++ b/tex/context/fonts/mkiv/hanbatanglvt.lfg
diff --git a/tex/context/fonts/husayni.lfg b/tex/context/fonts/mkiv/husayni.lfg
index 2f45add21..2f45add21 100644
--- a/tex/context/fonts/husayni.lfg
+++ b/tex/context/fonts/mkiv/husayni.lfg
diff --git a/tex/context/fonts/hvmath-math.lfg b/tex/context/fonts/mkiv/hvmath-math.lfg
index 0eba3db23..0eba3db23 100644
--- a/tex/context/fonts/hvmath-math.lfg
+++ b/tex/context/fonts/mkiv/hvmath-math.lfg
diff --git a/tex/context/fonts/informal-math.lfg b/tex/context/fonts/mkiv/informal-math.lfg
index a1f461740..a1f461740 100644
--- a/tex/context/fonts/informal-math.lfg
+++ b/tex/context/fonts/mkiv/informal-math.lfg
diff --git a/tex/context/fonts/iwona-math.lfg b/tex/context/fonts/mkiv/iwona-math.lfg
index f2fb69341..f2fb69341 100644
--- a/tex/context/fonts/iwona-math.lfg
+++ b/tex/context/fonts/mkiv/iwona-math.lfg
diff --git a/tex/context/fonts/lm-math.lfg b/tex/context/fonts/mkiv/lm-math.lfg
index b8c996979..b8c996979 100644
--- a/tex/context/fonts/lm-math.lfg
+++ b/tex/context/fonts/mkiv/lm-math.lfg
diff --git a/tex/context/fonts/lm.lfg b/tex/context/fonts/mkiv/lm.lfg
index 546d18def..546d18def 100644
--- a/tex/context/fonts/lm.lfg
+++ b/tex/context/fonts/mkiv/lm.lfg
diff --git a/tex/context/fonts/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
index 946458dea..946458dea 100644
--- a/tex/context/fonts/lucida-opentype-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
diff --git a/tex/context/fonts/lucida-typeone-math.lfg b/tex/context/fonts/mkiv/lucida-typeone-math.lfg
index 82ba589cd..82ba589cd 100644
--- a/tex/context/fonts/lucida-typeone-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-typeone-math.lfg
diff --git a/tex/context/fonts/mathtimes-math.lfg b/tex/context/fonts/mkiv/mathtimes-math.lfg
index 951cb6838..951cb6838 100644
--- a/tex/context/fonts/mathtimes-math.lfg
+++ b/tex/context/fonts/mkiv/mathtimes-math.lfg
diff --git a/tex/context/fonts/mdbch-math.lfg b/tex/context/fonts/mkiv/mdbch-math.lfg
index c66a3575a..c66a3575a 100644
--- a/tex/context/fonts/mdbch-math.lfg
+++ b/tex/context/fonts/mkiv/mdbch-math.lfg
diff --git a/tex/context/fonts/mdici-math.lfg b/tex/context/fonts/mkiv/mdici-math.lfg
index 84833c407..84833c407 100644
--- a/tex/context/fonts/mdici-math.lfg
+++ b/tex/context/fonts/mkiv/mdici-math.lfg
diff --git a/tex/context/fonts/mdpgd-math.lfg b/tex/context/fonts/mkiv/mdpgd-math.lfg
index b7863b46e..b7863b46e 100644
--- a/tex/context/fonts/mdpgd-math.lfg
+++ b/tex/context/fonts/mkiv/mdpgd-math.lfg
diff --git a/tex/context/fonts/mdpus-math.lfg b/tex/context/fonts/mkiv/mdpus-math.lfg
index 95d51de14..95d51de14 100644
--- a/tex/context/fonts/mdpus-math.lfg
+++ b/tex/context/fonts/mkiv/mdpus-math.lfg
diff --git a/tex/context/fonts/mdput-math.lfg b/tex/context/fonts/mkiv/mdput-math.lfg
index 7779ec152..7779ec152 100644
--- a/tex/context/fonts/mdput-math.lfg
+++ b/tex/context/fonts/mkiv/mdput-math.lfg
diff --git a/tex/context/fonts/mdugm-math.lfg b/tex/context/fonts/mkiv/mdugm-math.lfg
index 293c99371..293c99371 100644
--- a/tex/context/fonts/mdugm-math.lfg
+++ b/tex/context/fonts/mkiv/mdugm-math.lfg
diff --git a/tex/context/fonts/px-math.lfg b/tex/context/fonts/mkiv/px-math.lfg
index 14f71dad3..14f71dad3 100644
--- a/tex/context/fonts/px-math.lfg
+++ b/tex/context/fonts/mkiv/px-math.lfg
diff --git a/tex/context/fonts/symbol-math.lfg b/tex/context/fonts/mkiv/symbol-math.lfg
index d37a3b1ee..d37a3b1ee 100644
--- a/tex/context/fonts/symbol-math.lfg
+++ b/tex/context/fonts/mkiv/symbol-math.lfg
diff --git a/tex/context/fonts/texgyre.lfg b/tex/context/fonts/mkiv/texgyre.lfg
index bcbc2ad86..bcbc2ad86 100644
--- a/tex/context/fonts/texgyre.lfg
+++ b/tex/context/fonts/mkiv/texgyre.lfg
diff --git a/tex/context/fonts/treatments.lfg b/tex/context/fonts/mkiv/treatments.lfg
index 40bac427c..40bac427c 100644
--- a/tex/context/fonts/treatments.lfg
+++ b/tex/context/fonts/mkiv/treatments.lfg
diff --git a/tex/context/fonts/tx-math.lfg b/tex/context/fonts/mkiv/tx-math.lfg
index 2ad173486..2ad173486 100644
--- a/tex/context/fonts/tx-math.lfg
+++ b/tex/context/fonts/mkiv/tx-math.lfg
diff --git a/tex/context/base/type-imp-antykwa.mkiv b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
index ba5895c8e..ba5895c8e 100644
--- a/tex/context/base/type-imp-antykwa.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
diff --git a/tex/context/base/type-imp-antykwapoltawskiego.mkiv b/tex/context/fonts/mkiv/type-imp-antykwapoltawskiego.mkiv
index 5a4c1c462..5a4c1c462 100644
--- a/tex/context/base/type-imp-antykwapoltawskiego.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-antykwapoltawskiego.mkiv
diff --git a/tex/context/base/type-imp-asana.mkiv b/tex/context/fonts/mkiv/type-imp-asana.mkiv
index b87c969e2..b87c969e2 100644
--- a/tex/context/base/type-imp-asana.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-asana.mkiv
diff --git a/tex/context/base/type-imp-averia.mkiv b/tex/context/fonts/mkiv/type-imp-averia.mkiv
index fd0ee7100..fd0ee7100 100644
--- a/tex/context/base/type-imp-averia.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-averia.mkiv
diff --git a/tex/context/base/type-imp-buy.mkiv b/tex/context/fonts/mkiv/type-imp-buy.mkiv
index dbfffe57c..dbfffe57c 100644
--- a/tex/context/base/type-imp-buy.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-buy.mkiv
diff --git a/tex/context/base/type-imp-cambria.mkiv b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
index 8154817bd..8154817bd 100644
--- a/tex/context/base/type-imp-cambria.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
diff --git a/tex/context/base/type-imp-charter.mkiv b/tex/context/fonts/mkiv/type-imp-charter.mkiv
index b788a974e..b788a974e 100644
--- a/tex/context/base/type-imp-charter.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-charter.mkiv
diff --git a/tex/context/base/type-imp-cleartype.mkiv b/tex/context/fonts/mkiv/type-imp-cleartype.mkiv
index b2f1b21a5..b2f1b21a5 100644
--- a/tex/context/base/type-imp-cleartype.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-cleartype.mkiv
diff --git a/tex/context/base/type-imp-computer-modern-unicode.mkiv b/tex/context/fonts/mkiv/type-imp-computer-modern-unicode.mkiv
index 0789b922e..0789b922e 100644
--- a/tex/context/base/type-imp-computer-modern-unicode.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-computer-modern-unicode.mkiv
diff --git a/tex/context/base/type-imp-cow.mkiv b/tex/context/fonts/mkiv/type-imp-cow.mkiv
index f93e36428..f93e36428 100644
--- a/tex/context/base/type-imp-cow.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-cow.mkiv
diff --git a/tex/context/base/type-imp-dejavu.mkiv b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
index 41cf1f701..41cf1f701 100644
--- a/tex/context/base/type-imp-dejavu.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
diff --git a/tex/context/base/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
index 838654d49..838654d49 100644
--- a/tex/context/base/type-imp-ebgaramond.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
diff --git a/tex/context/base/type-imp-euler.mkiv b/tex/context/fonts/mkiv/type-imp-euler.mkiv
index d3b552b56..d3b552b56 100644
--- a/tex/context/base/type-imp-euler.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-euler.mkiv
diff --git a/tex/context/base/type-imp-gentium.mkiv b/tex/context/fonts/mkiv/type-imp-gentium.mkiv
index b2ad35a96..b2ad35a96 100644
--- a/tex/context/base/type-imp-gentium.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-gentium.mkiv
diff --git a/tex/context/base/type-imp-ghz.mkiv b/tex/context/fonts/mkiv/type-imp-ghz.mkiv
index 868d73021..868d73021 100644
--- a/tex/context/base/type-imp-ghz.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ghz.mkiv
diff --git a/tex/context/base/type-imp-hgz.mkiv b/tex/context/fonts/mkiv/type-imp-hgz.mkiv
index 091adeb2d..091adeb2d 100644
--- a/tex/context/base/type-imp-hgz.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-hgz.mkiv
diff --git a/tex/context/base/type-imp-husayni.mkiv b/tex/context/fonts/mkiv/type-imp-husayni.mkiv
index 76cbf77db..76cbf77db 100644
--- a/tex/context/base/type-imp-husayni.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-husayni.mkiv
diff --git a/tex/context/base/type-imp-hvmath.mkiv b/tex/context/fonts/mkiv/type-imp-hvmath.mkiv
index 01595710e..01595710e 100644
--- a/tex/context/base/type-imp-hvmath.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-hvmath.mkiv
diff --git a/tex/context/base/type-imp-inconsolata.mkiv b/tex/context/fonts/mkiv/type-imp-inconsolata.mkiv
index 159759e9b..159759e9b 100644
--- a/tex/context/base/type-imp-inconsolata.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-inconsolata.mkiv
diff --git a/tex/context/base/type-imp-informal.mkiv b/tex/context/fonts/mkiv/type-imp-informal.mkiv
index 575a836e5..575a836e5 100644
--- a/tex/context/base/type-imp-informal.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-informal.mkiv
diff --git a/tex/context/base/type-imp-ipaex.mkiv b/tex/context/fonts/mkiv/type-imp-ipaex.mkiv
index b11f96878..b11f96878 100644
--- a/tex/context/base/type-imp-ipaex.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ipaex.mkiv
diff --git a/tex/context/base/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
index 88cb7e719..88cb7e719 100644
--- a/tex/context/base/type-imp-iwona.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
diff --git a/tex/context/base/type-imp-kurier.mkiv b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
index d83510b95..d83510b95 100644
--- a/tex/context/base/type-imp-kurier.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
diff --git a/tex/context/base/type-imp-latinmodern.mkiv b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
index fe4b669bd..fe4b669bd 100644
--- a/tex/context/base/type-imp-latinmodern.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
diff --git a/tex/context/base/type-imp-lato.mkiv b/tex/context/fonts/mkiv/type-imp-lato.mkiv
index 8fb8647fc..8fb8647fc 100644
--- a/tex/context/base/type-imp-lato.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lato.mkiv
diff --git a/tex/context/base/type-imp-liberation.mkiv b/tex/context/fonts/mkiv/type-imp-liberation.mkiv
index cc2c01b7b..cc2c01b7b 100644
--- a/tex/context/base/type-imp-liberation.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-liberation.mkiv
diff --git a/tex/context/base/type-imp-libertine.mkiv b/tex/context/fonts/mkiv/type-imp-libertine.mkiv
index 4620995b9..4620995b9 100644
--- a/tex/context/base/type-imp-libertine.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-libertine.mkiv
diff --git a/tex/context/base/type-imp-lmnames.mkiv b/tex/context/fonts/mkiv/type-imp-lmnames.mkiv
index 11ba93c34..11ba93c34 100644
--- a/tex/context/base/type-imp-lmnames.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lmnames.mkiv
diff --git a/tex/context/base/type-imp-lucida-opentype.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
index f39ed6e1f..f39ed6e1f 100644
--- a/tex/context/base/type-imp-lucida-opentype.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
diff --git a/tex/context/base/type-imp-lucida-typeone.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv
index 5f28b9eed..5f28b9eed 100644
--- a/tex/context/base/type-imp-lucida-typeone.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lucida-typeone.mkiv
diff --git a/tex/context/base/type-imp-mathdesign.mkiv b/tex/context/fonts/mkiv/type-imp-mathdesign.mkiv
index 00e753e75..00e753e75 100644
--- a/tex/context/base/type-imp-mathdesign.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-mathdesign.mkiv
diff --git a/tex/context/base/type-imp-mathdigits.mkiv b/tex/context/fonts/mkiv/type-imp-mathdigits.mkiv
index 7a7e6b764..7a7e6b764 100644
--- a/tex/context/base/type-imp-mathdigits.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-mathdigits.mkiv
diff --git a/tex/context/base/type-imp-mathtimes.mkiv b/tex/context/fonts/mkiv/type-imp-mathtimes.mkiv
index 212882772..212882772 100644
--- a/tex/context/base/type-imp-mathtimes.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-mathtimes.mkiv
diff --git a/tex/context/base/type-imp-mscore.mkiv b/tex/context/fonts/mkiv/type-imp-mscore.mkiv
index 971a03de7..971a03de7 100644
--- a/tex/context/base/type-imp-mscore.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-mscore.mkiv
diff --git a/tex/context/base/type-imp-opendyslexic.mkiv b/tex/context/fonts/mkiv/type-imp-opendyslexic.mkiv
index 770d43c6c..770d43c6c 100644
--- a/tex/context/base/type-imp-opendyslexic.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-opendyslexic.mkiv
diff --git a/tex/context/base/type-imp-osx.mkiv b/tex/context/fonts/mkiv/type-imp-osx.mkiv
index 16b8e0545..16b8e0545 100644
--- a/tex/context/base/type-imp-osx.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-osx.mkiv
diff --git a/tex/context/base/type-imp-postscript.mkiv b/tex/context/fonts/mkiv/type-imp-postscript.mkiv
index c53b89519..c53b89519 100644
--- a/tex/context/base/type-imp-postscript.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-postscript.mkiv
diff --git a/tex/context/base/type-imp-punknova.mkiv b/tex/context/fonts/mkiv/type-imp-punknova.mkiv
index 8d95bf885..8d95bf885 100644
--- a/tex/context/base/type-imp-punknova.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-punknova.mkiv
diff --git a/tex/context/base/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
index ca5d456e5..ca5d456e5 100644
--- a/tex/context/base/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
diff --git a/tex/context/base/type-imp-unfonts.mkiv b/tex/context/fonts/mkiv/type-imp-unfonts.mkiv
index 91ae3b230..91ae3b230 100644
--- a/tex/context/base/type-imp-unfonts.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-unfonts.mkiv
diff --git a/tex/context/base/type-imp-xits.mkiv b/tex/context/fonts/mkiv/type-imp-xits.mkiv
index f83050e14..f83050e14 100644
--- a/tex/context/base/type-imp-xits.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-xits.mkiv
diff --git a/tex/context/base/type-imp-xitsbidi.mkiv b/tex/context/fonts/mkiv/type-imp-xitsbidi.mkiv
index 33c4340ed..33c4340ed 100644
--- a/tex/context/base/type-imp-xitsbidi.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-xitsbidi.mkiv
diff --git a/tex/context/fonts/unifraktur.lfg b/tex/context/fonts/mkiv/unifraktur.lfg
index 32ffed928..32ffed928 100644
--- a/tex/context/fonts/unifraktur.lfg
+++ b/tex/context/fonts/mkiv/unifraktur.lfg
diff --git a/tex/context/fonts/xits-math.lfg b/tex/context/fonts/mkiv/xits-math.lfg
index 8e1274365..8e1274365 100644
--- a/tex/context/fonts/xits-math.lfg
+++ b/tex/context/fonts/mkiv/xits-math.lfg
diff --git a/tex/context/interface/cont-cs.xml b/tex/context/interface/common/cont-cs.xml
index 7eb672874..0d51d5a4f 100644
--- a/tex/context/interface/cont-cs.xml
+++ b/tex/context/interface/common/cont-cs.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="cs" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="uzijkodovani"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="ukazzakladnifont"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="cs"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="polozka"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="polozka"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="spodek"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definujrejstrik"/>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/common/cont-de.xml
index f40927b45..ede21ab2b 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/common/cont-de.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="de" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="benutzekodierung"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="zeigefliesstext"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="de"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="pos"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="pos"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="but"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definiereregister"/>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/common/cont-en.xml
index 651292e7f..de2ee4f6a 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/common/cont-en.xml
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="useencoding"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="showbodyfont"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="en"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="item"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="item"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="but"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="defineregister"/>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/common/cont-fr.xml
index 30a89c059..e69e60313 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/common/cont-fr.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="fr" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="utiliseencodage"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="montrepolicecorps"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="fr"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="element"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="element"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="but"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definitregistre"/>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/common/cont-it.xml
index 32d19e87f..66843c997 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/common/cont-it.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="it" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="usacodifica"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="mostrafontdeltesto"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="it"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="elemento"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="elemento"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="fondo"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definisciregistro"/>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/common/cont-nl.xml
index 6c49baccd..66e430ebb 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/common/cont-nl.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="nl" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="usecodering"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="toonkorps"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="nl"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="definieeritemgroep"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="stelitemgroepin"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="som"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="som"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="but"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definieerregister"/>
diff --git a/tex/context/interface/cont-pe.xml b/tex/context/interface/common/cont-pe.xml
index bf7d65fd0..b4a43eb12 100644
--- a/tex/context/interface/cont-pe.xml
+++ b/tex/context/interface/common/cont-pe.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="pe" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="است�اده‌رمزینه"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="نمایش‌قلم‌بدنه"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="pe"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="تعری�‌گروه‌آیتم"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="بارگذاری‌گروه‌آیتم"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="آیتم"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="آیتم"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="اما"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="تعری�‌ثبت"/>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/common/cont-ro.xml
index b81c3bc7e..b89dd607e 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/common/cont-ro.xml
@@ -11,7 +11,7 @@
 
 -->
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="ro" version="2006.08.02">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
 
   <!-- there are some more -->
 
@@ -244,7 +244,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding"> <!-- engine="pdftex" -->
+  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
     <cd:sequence>
       <cd:string value="folosestecodificarea"/>
     </cd:sequence>
@@ -478,7 +478,6 @@
     </cd:arguments>
   </cd:command>
 
-
   <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
     <cd:sequence>
       <cd:string value="afiseazafonttext"/>
@@ -6180,7 +6179,29 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="setupitemgroup" file="core-itm.tex">
+  <!--
+
+  <cd:feature name="itemgroups" file="strc-itm">
+
+    <cd:description language="ro"> </cd:description>
+
+  -->
+
+  <cd:command name="defineitemgroup" file="strc-itm">
+    <cd:sequence>
+      <cd:string value="defineitemgroup"/>
+    </cd:sequence>
+    <cd:arguments>
+      <cd:keywords n="1">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+      <cd:keywords n="2" optional="yes">
+        <cd:constant type="cd:name"/>
+      </cd:keywords>
+    </cd:arguments>
+  </cd:command>
+
+  <cd:command name="setupitemgroup" file="strc-itm">
     <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
     <cd:sequence>
       <cd:string value="setupitemgroup"/>
@@ -6308,7 +6329,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="itemgroup" type="environment" generated="yes" file="core-itm.tex">
+  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
     <cd:sequence>
       <cd:variable value="itemgroup"/>
     </cd:sequence>
@@ -6348,7 +6369,7 @@
     </cd:arguments>
   </cd:command>
 
-  <cd:command name="item" file="core-itm.tex">
+  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
     <cd:sequence>
       <cd:string value="element"/>
     </cd:sequence>
@@ -6357,6 +6378,17 @@
     </cd:arguments>
   </cd:command>
 
+  <!--
+    <cd:command name="item" file="core-itm.tex">
+      <cd:sequence>
+        <cd:string value="element"/>
+      </cd:sequence>
+      <cd:arguments>
+        <cd:reference n="1" optional="yes" list="yes"/>
+      </cd:arguments>
+    </cd:command>
+  -->
+
   <cd:command name="but">
     <cd:sequence>
       <cd:string value="but"/>
@@ -6427,6 +6459,8 @@
     </cd:sequence>
   </cd:command>
 
+  <!-- </cd:feature> -->
+
   <cd:command name="defineregister" file="core-reg.tex">
     <cd:sequence>
       <cd:string value="definesteregistru"/>
diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/common/keys-cs.xml
index 9cea5865e..9cea5865e 100644
--- a/tex/context/interface/keys-cs.xml
+++ b/tex/context/interface/common/keys-cs.xml
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/common/keys-cz.xml
index ef47e5f3f..ef47e5f3f 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/common/keys-cz.xml
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/common/keys-de.xml
index 83557c175..83557c175 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/common/keys-de.xml
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/common/keys-en.xml
index f9748423d..f9748423d 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/common/keys-en.xml
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/common/keys-fr.xml
index 8d06486a9..8d06486a9 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/common/keys-fr.xml
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/common/keys-it.xml
index 2df7c0021..2df7c0021 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/common/keys-it.xml
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/common/keys-nl.xml
index d95a4e107..d95a4e107 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/common/keys-nl.xml
diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/common/keys-pe.xml
index 248cf4db7..248cf4db7 100644
--- a/tex/context/interface/keys-pe.xml
+++ b/tex/context/interface/common/keys-pe.xml
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/common/keys-ro.xml
index 232101d71..232101d71 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/common/keys-ro.xml
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/modules/common/s-abr-01.tex
index 00a1a5c1e..00a1a5c1e 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/modules/common/s-abr-01.tex
diff --git a/tex/context/base/s-abr-02.tex b/tex/context/modules/common/s-abr-02.tex
index 8bb6a2898..8bb6a2898 100644
--- a/tex/context/base/s-abr-02.tex
+++ b/tex/context/modules/common/s-abr-02.tex
diff --git a/tex/context/base/s-abr-03.tex b/tex/context/modules/common/s-abr-03.tex
index 8247b68a9..8247b68a9 100644
--- a/tex/context/base/s-abr-03.tex
+++ b/tex/context/modules/common/s-abr-03.tex
diff --git a/tex/context/base/s-abr-04.tex b/tex/context/modules/common/s-abr-04.tex
index 23940b526..23940b526 100644
--- a/tex/context/base/s-abr-04.tex
+++ b/tex/context/modules/common/s-abr-04.tex
diff --git a/tex/context/base/s-cdr-01.tex b/tex/context/modules/common/s-cdr-01.tex
index b0bced9da..b0bced9da 100644
--- a/tex/context/base/s-cdr-01.tex
+++ b/tex/context/modules/common/s-cdr-01.tex
diff --git a/tex/context/base/s-faq-00.tex b/tex/context/modules/common/s-faq-00.tex
index 84055491f..84055491f 100644
--- a/tex/context/base/s-faq-00.tex
+++ b/tex/context/modules/common/s-faq-00.tex
diff --git a/tex/context/base/s-faq-01.tex b/tex/context/modules/common/s-faq-01.tex
index f6ee3ce06..f6ee3ce06 100644
--- a/tex/context/base/s-faq-01.tex
+++ b/tex/context/modules/common/s-faq-01.tex
diff --git a/tex/context/base/s-faq-02.tex b/tex/context/modules/common/s-faq-02.tex
index 92aa1eca2..92aa1eca2 100644
--- a/tex/context/base/s-faq-02.tex
+++ b/tex/context/modules/common/s-faq-02.tex
diff --git a/tex/context/base/s-faq-03.tex b/tex/context/modules/common/s-faq-03.tex
index b1e1ef2c2..b1e1ef2c2 100644
--- a/tex/context/base/s-faq-03.tex
+++ b/tex/context/modules/common/s-faq-03.tex
diff --git a/tex/context/base/s-mag-01.tex b/tex/context/modules/common/s-mag-01.tex
index b90dceb66..e2d30f4e5 100644
--- a/tex/context/base/s-mag-01.tex
+++ b/tex/context/modules/common/s-mag-01.tex
@@ -391,22 +391,48 @@
 \definetype  [ntype]   \setuptype  [ntype]  [style=\narrowtt]
 
 \doifnotmode{demo}{\endinput}
-
+
+% \usemodule[mag-01]
+
+\setvariables
+  [magazine]
+  [title={Introduction},
+   author=Hans Hagen,
+   affiliation=PRAGMA ADE,
+   date=Januari 2003,
+   number=0]
+
 \startbuffer[abstract]
-  \input tufte
+  This is the zero issue of a semi periodical. The
+  associated style can be used by \CONTEXT\ users to
+  typeset and publish their own issues.
 \stopbuffer
 
-\starttext
+\starttext \setups [titlepage] \setups [title]
+
+\setupheadertexts[welcome]
+
+This is the zero issue of a range of \CONTEXT\ related
+publications, in most cases short introductions to new
+functionality. The style may be used by users for providing
+similar documents, but preferably not for other purposes,
+since it may confuse readers in their expectations.
 
-  % \showframe
+We've chosen a layout which is more functional than
+beautiful. This layout provides several text areas: headers
+and footers, margins and edges as well as a main text area.
+The surrounding (gray) makes the main page (which is
+slightly smaller than A4) stand out and is suitable for
+viewing in spread mode.
 
-  \setups[titlepage] \setups[title]
+The documents produced at \PRAGMA\ are called {\bf This
+Way}, user documents gets the title {\bf My Way}. The
+\PRAGMA\ issues are numbered. We strongly advise you not to
+use the \type {mag-} prefix for your issues, since this may
+lead to clashes with files distributed by \PRAGMA.
 
-  \chapter{E.R.   Tufte}      \input tufte   \page
-  \chapter{D.E.K. Knuth}      \input knuth   \page
-  \chapter{H.     Zapf}       \input zapf    \page
-  \chapter{D.     Hofstadter} \input douglas \page
+\setups [listing]
 
-  \setups[lastpage]
+\setups [lastpage]
 
 \stoptext
diff --git a/tex/context/base/s-mod.ctx b/tex/context/modules/common/s-mod.ctx
index 09ecf714c..09ecf714c 100644
--- a/tex/context/base/s-mod.ctx
+++ b/tex/context/modules/common/s-mod.ctx
diff --git a/tex/context/base/s-pre-00.tex b/tex/context/modules/common/s-pre-00.tex
index 7f217d5bb..7f217d5bb 100644
--- a/tex/context/base/s-pre-00.tex
+++ b/tex/context/modules/common/s-pre-00.tex
diff --git a/tex/context/base/s-pre-01.tex b/tex/context/modules/common/s-pre-01.tex
index 89c5642f9..89c5642f9 100644
--- a/tex/context/base/s-pre-01.tex
+++ b/tex/context/modules/common/s-pre-01.tex
diff --git a/tex/context/base/s-pre-02.tex b/tex/context/modules/common/s-pre-02.tex
index d7a6fe458..d7a6fe458 100644
--- a/tex/context/base/s-pre-02.tex
+++ b/tex/context/modules/common/s-pre-02.tex
diff --git a/tex/context/base/s-pre-03.tex b/tex/context/modules/common/s-pre-03.tex
index 19a11d24e..19a11d24e 100644
--- a/tex/context/base/s-pre-03.tex
+++ b/tex/context/modules/common/s-pre-03.tex
diff --git a/tex/context/base/s-pre-04.tex b/tex/context/modules/common/s-pre-04.tex
index 088f4e510..088f4e510 100644
--- a/tex/context/base/s-pre-04.tex
+++ b/tex/context/modules/common/s-pre-04.tex
diff --git a/tex/context/base/s-pre-05.tex b/tex/context/modules/common/s-pre-05.tex
index ccffd1f4d..ccffd1f4d 100644
--- a/tex/context/base/s-pre-05.tex
+++ b/tex/context/modules/common/s-pre-05.tex
diff --git a/tex/context/base/s-pre-06.tex b/tex/context/modules/common/s-pre-06.tex
index 47948262c..47948262c 100644
--- a/tex/context/base/s-pre-06.tex
+++ b/tex/context/modules/common/s-pre-06.tex
diff --git a/tex/context/base/s-pre-07.tex b/tex/context/modules/common/s-pre-07.tex
index ba62b3236..ba62b3236 100644
--- a/tex/context/base/s-pre-07.tex
+++ b/tex/context/modules/common/s-pre-07.tex
diff --git a/tex/context/base/s-pre-08.tex b/tex/context/modules/common/s-pre-08.tex
index b545bef23..b545bef23 100644
--- a/tex/context/base/s-pre-08.tex
+++ b/tex/context/modules/common/s-pre-08.tex
diff --git a/tex/context/base/s-pre-09.tex b/tex/context/modules/common/s-pre-09.tex
index a20b9f31a..a20b9f31a 100644
--- a/tex/context/base/s-pre-09.tex
+++ b/tex/context/modules/common/s-pre-09.tex
diff --git a/tex/context/base/s-pre-10.tex b/tex/context/modules/common/s-pre-10.tex
index a92e5af01..a92e5af01 100644
--- a/tex/context/base/s-pre-10.tex
+++ b/tex/context/modules/common/s-pre-10.tex
diff --git a/tex/context/base/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex
index 551c5ebbc..551c5ebbc 100644
--- a/tex/context/base/s-pre-11.tex
+++ b/tex/context/modules/common/s-pre-11.tex
diff --git a/tex/context/base/s-pre-12.tex b/tex/context/modules/common/s-pre-12.tex
index 23418fbba..23418fbba 100644
--- a/tex/context/base/s-pre-12.tex
+++ b/tex/context/modules/common/s-pre-12.tex
diff --git a/tex/context/base/s-pre-13.tex b/tex/context/modules/common/s-pre-13.tex
index 7b4daa4b3..7b4daa4b3 100644
--- a/tex/context/base/s-pre-13.tex
+++ b/tex/context/modules/common/s-pre-13.tex
diff --git a/tex/context/base/s-pre-14.tex b/tex/context/modules/common/s-pre-14.tex
index 4dae6c009..4dae6c009 100644
--- a/tex/context/base/s-pre-14.tex
+++ b/tex/context/modules/common/s-pre-14.tex
diff --git a/tex/context/base/s-pre-15.tex b/tex/context/modules/common/s-pre-15.tex
index 25fb35783..25fb35783 100644
--- a/tex/context/base/s-pre-15.tex
+++ b/tex/context/modules/common/s-pre-15.tex
diff --git a/tex/context/base/s-pre-16.tex b/tex/context/modules/common/s-pre-16.tex
index 715936890..715936890 100644
--- a/tex/context/base/s-pre-16.tex
+++ b/tex/context/modules/common/s-pre-16.tex
diff --git a/tex/context/base/s-pre-18.tex b/tex/context/modules/common/s-pre-18.tex
index 876eec5f1..876eec5f1 100644
--- a/tex/context/base/s-pre-18.tex
+++ b/tex/context/modules/common/s-pre-18.tex
diff --git a/tex/context/base/s-pre-19.tex b/tex/context/modules/common/s-pre-19.tex
index 991d311ce..991d311ce 100644
--- a/tex/context/base/s-pre-19.tex
+++ b/tex/context/modules/common/s-pre-19.tex
diff --git a/tex/context/base/s-pre-22.tex b/tex/context/modules/common/s-pre-22.tex
index be50ae195..be50ae195 100644
--- a/tex/context/base/s-pre-22.tex
+++ b/tex/context/modules/common/s-pre-22.tex
diff --git a/tex/context/base/s-pre-23.tex b/tex/context/modules/common/s-pre-23.tex
index f9983a89e..f9983a89e 100644
--- a/tex/context/base/s-pre-23.tex
+++ b/tex/context/modules/common/s-pre-23.tex
diff --git a/tex/context/base/s-pre-26.tex b/tex/context/modules/common/s-pre-26.tex
index 7c1dec5f8..7c1dec5f8 100644
--- a/tex/context/base/s-pre-26.tex
+++ b/tex/context/modules/common/s-pre-26.tex
diff --git a/tex/context/base/s-pre-27.tex b/tex/context/modules/common/s-pre-27.tex
index 2e201e8df..2e201e8df 100644
--- a/tex/context/base/s-pre-27.tex
+++ b/tex/context/modules/common/s-pre-27.tex
diff --git a/tex/context/base/s-pre-50.tex b/tex/context/modules/common/s-pre-50.tex
index ff3e48631..ff3e48631 100644
--- a/tex/context/base/s-pre-50.tex
+++ b/tex/context/modules/common/s-pre-50.tex
diff --git a/tex/context/base/s-pre-61.tex b/tex/context/modules/common/s-pre-61.tex
index 48b9d09a0..48b9d09a0 100644
--- a/tex/context/base/s-pre-61.tex
+++ b/tex/context/modules/common/s-pre-61.tex
diff --git a/tex/context/base/s-pre-62.tex b/tex/context/modules/common/s-pre-62.tex
index a1a405c23..a1a405c23 100644
--- a/tex/context/base/s-pre-62.tex
+++ b/tex/context/modules/common/s-pre-62.tex
diff --git a/tex/context/base/s-pre-63.tex b/tex/context/modules/common/s-pre-63.tex
index 974c67a5f..974c67a5f 100644
--- a/tex/context/base/s-pre-63.tex
+++ b/tex/context/modules/common/s-pre-63.tex
diff --git a/tex/context/base/s-pre-64.tex b/tex/context/modules/common/s-pre-64.tex
index ef4889bbb..ef4889bbb 100644
--- a/tex/context/base/s-pre-64.tex
+++ b/tex/context/modules/common/s-pre-64.tex
diff --git a/tex/context/base/s-pre-66.tex b/tex/context/modules/common/s-pre-66.tex
index 3e89e4a7e..3e89e4a7e 100644
--- a/tex/context/base/s-pre-66.tex
+++ b/tex/context/modules/common/s-pre-66.tex
diff --git a/tex/context/base/s-pre-67.tex b/tex/context/modules/common/s-pre-67.tex
index 84ea1a66c..84ea1a66c 100644
--- a/tex/context/base/s-pre-67.tex
+++ b/tex/context/modules/common/s-pre-67.tex
diff --git a/tex/context/base/s-pre-68.tex b/tex/context/modules/common/s-pre-68.tex
index 3c04a87e1..3c04a87e1 100644
--- a/tex/context/base/s-pre-68.tex
+++ b/tex/context/modules/common/s-pre-68.tex
diff --git a/tex/context/base/s-pre-93.tex b/tex/context/modules/common/s-pre-93.tex
index c36762f38..c36762f38 100644
--- a/tex/context/base/s-pre-93.tex
+++ b/tex/context/modules/common/s-pre-93.tex
diff --git a/tex/context/base/s-pre-96.tex b/tex/context/modules/common/s-pre-96.tex
index 2ad752007..2ad752007 100644
--- a/tex/context/base/s-pre-96.tex
+++ b/tex/context/modules/common/s-pre-96.tex
diff --git a/tex/context/base/m-arabtex.mkii b/tex/context/modules/mkii/m-arabtex.mkii
index dea1cae25..dea1cae25 100644
--- a/tex/context/base/m-arabtex.mkii
+++ b/tex/context/modules/mkii/m-arabtex.mkii
diff --git a/tex/context/base/m-chart.mkii b/tex/context/modules/mkii/m-chart.mkii
index 8a5f480ee..8a5f480ee 100644
--- a/tex/context/base/m-chart.mkii
+++ b/tex/context/modules/mkii/m-chart.mkii
diff --git a/tex/context/base/m-chemic.mkii b/tex/context/modules/mkii/m-chemic.mkii
index 0b3c98221..0b3c98221 100644
--- a/tex/context/base/m-chemic.mkii
+++ b/tex/context/modules/mkii/m-chemic.mkii
diff --git a/tex/context/base/m-cweb.tex b/tex/context/modules/mkii/m-cweb.mkii
index bf80e229c..bf80e229c 100644
--- a/tex/context/base/m-cweb.tex
+++ b/tex/context/modules/mkii/m-cweb.mkii
diff --git a/tex/context/base/m-database.mkii b/tex/context/modules/mkii/m-database.mkii
index abb67986e..abb67986e 100644
--- a/tex/context/base/m-database.mkii
+++ b/tex/context/modules/mkii/m-database.mkii
diff --git a/tex/context/base/m-dratex.mkii b/tex/context/modules/mkii/m-dratex.mkii
index 2b5f0be2a..2b5f0be2a 100644
--- a/tex/context/base/m-dratex.mkii
+++ b/tex/context/modules/mkii/m-dratex.mkii
diff --git a/tex/context/base/m-edtsnc.mkii b/tex/context/modules/mkii/m-edtsnc.mkii
index 0f66893e8..0f66893e8 100644
--- a/tex/context/base/m-edtsnc.mkii
+++ b/tex/context/modules/mkii/m-edtsnc.mkii
diff --git a/tex/context/base/m-educat.tex b/tex/context/modules/mkii/m-educat.mkii
index 93b1a6c5d..93b1a6c5d 100644
--- a/tex/context/base/m-educat.tex
+++ b/tex/context/modules/mkii/m-educat.mkii
diff --git a/tex/context/base/m-format.tex b/tex/context/modules/mkii/m-format.mkii
index e974e4a11..7cedd803f 100644
--- a/tex/context/base/m-format.tex
+++ b/tex/context/modules/mkii/m-format.mkii
@@ -339,10 +339,12 @@
 \defineformatline[line]
   []
 
-\protect \doifnotmode{demo} {\endinput}
-
+\protect
+
+\doifnotmode{demo} {\endinput}
+
 % evt defineblank[formatbefore,formatinbetween,formatafter]
-
+
 %\showframe \traceformatblocktrue
 
 \usemodule[visual]
diff --git a/tex/context/base/m-graph.mkii b/tex/context/modules/mkii/m-graph.mkii
index 8e28cf537..8e28cf537 100644
--- a/tex/context/base/m-graph.mkii
+++ b/tex/context/modules/mkii/m-graph.mkii
diff --git a/tex/context/base/m-layout.tex b/tex/context/modules/mkii/m-layout.mkii
index 5ccf0e987..5ccf0e987 100644
--- a/tex/context/base/m-layout.tex
+++ b/tex/context/modules/mkii/m-layout.mkii
diff --git a/tex/context/base/m-level.mkii b/tex/context/modules/mkii/m-level.mkii
index d758288d7..d758288d7 100644
--- a/tex/context/base/m-level.mkii
+++ b/tex/context/modules/mkii/m-level.mkii
diff --git a/tex/context/base/m-narrowtt.tex b/tex/context/modules/mkii/m-narrowtt.mkii
index 129bf270b..129bf270b 100644
--- a/tex/context/base/m-narrowtt.tex
+++ b/tex/context/modules/mkii/m-narrowtt.mkii
diff --git a/tex/context/base/m-obsolete.mkii b/tex/context/modules/mkii/m-obsolete.mkii
index a97002cf6..a97002cf6 100644
--- a/tex/context/base/m-obsolete.mkii
+++ b/tex/context/modules/mkii/m-obsolete.mkii
diff --git a/tex/context/base/m-pdfsnc.mkii b/tex/context/modules/mkii/m-pdfsnc.mkii
index 12e2e2d68..12e2e2d68 100644
--- a/tex/context/base/m-pdfsnc.mkii
+++ b/tex/context/modules/mkii/m-pdfsnc.mkii
diff --git a/tex/context/base/m-pictex.tex b/tex/context/modules/mkii/m-pictex.mkii
index 27dc6a439..e27bf6315 100644
--- a/tex/context/base/m-pictex.tex
+++ b/tex/context/modules/mkii/m-pictex.mkii
@@ -186,22 +186,6 @@
      %\immediate\write20{\string#1 already is \ascii}%
    \fi}
 
-% \def\newdimen#1%
-%   {\bgroup
-%    \escapechar=-1
-%    \def\next##1##2%
-%      {\def\next####1##1####2####3\next%
-%         {\egroup
-%          \if####2@
-%            \temporarynewdimen#1\relax
-%          \ifnum\count11>\count12
-%            \temporarynewskip#1\relax
-%          \else
-%            \temporarynewdimen#1\relax
-%          \fi\fi}%
-%       \expandafter\next\string##2##1@@\next}%
-%    \expandafter\next\expandafter{\string\dimen}#1}
-%
 % This macro is as unreadable, inefficient and as compact as
 % can be, but uses no extra hash entries, which sometimes are
 % scarce too. A more readable alternative, that also takes
diff --git a/tex/context/base/m-pstricks.mkii b/tex/context/modules/mkii/m-pstricks.mkii
index d41f19871..d41f19871 100644
--- a/tex/context/base/m-pstricks.mkii
+++ b/tex/context/modules/mkii/m-pstricks.mkii
diff --git a/tex/context/base/m-r.mkii b/tex/context/modules/mkii/m-r.mkii
index c2cb7ba88..c2cb7ba88 100644
--- a/tex/context/base/m-r.mkii
+++ b/tex/context/modules/mkii/m-r.mkii
diff --git a/tex/context/base/m-steps.mkii b/tex/context/modules/mkii/m-steps.mkii
index e6bd45548..e6bd45548 100644
--- a/tex/context/base/m-steps.mkii
+++ b/tex/context/modules/mkii/m-steps.mkii
diff --git a/tex/context/base/m-subsub.tex b/tex/context/modules/mkii/m-subsub.mkii
index 88be11680..88be11680 100644
--- a/tex/context/base/m-subsub.tex
+++ b/tex/context/modules/mkii/m-subsub.mkii
diff --git a/tex/context/base/m-tex4ht.mkii b/tex/context/modules/mkii/m-tex4ht.mkii
index 8a3dc9dbb..8a3dc9dbb 100644
--- a/tex/context/base/m-tex4ht.mkii
+++ b/tex/context/modules/mkii/m-tex4ht.mkii
diff --git a/tex/context/base/m-units.mkii b/tex/context/modules/mkii/m-units.mkii
index af4629d48..af4629d48 100644
--- a/tex/context/base/m-units.mkii
+++ b/tex/context/modules/mkii/m-units.mkii
diff --git a/tex/context/base/m-visual.mkii b/tex/context/modules/mkii/m-visual.mkii
index ae52f6571..ae52f6571 100644
--- a/tex/context/base/m-visual.mkii
+++ b/tex/context/modules/mkii/m-visual.mkii
diff --git a/tex/context/base/ppchtex.mkii b/tex/context/modules/mkii/ppchtex.mkii
index 07ca9789a..07ca9789a 100644
--- a/tex/context/base/ppchtex.mkii
+++ b/tex/context/modules/mkii/ppchtex.mkii
diff --git a/tex/context/base/rlxcache.rlx b/tex/context/modules/mkii/rlxcache.rlx
index 006e5feac..006e5feac 100644
--- a/tex/context/base/rlxcache.rlx
+++ b/tex/context/modules/mkii/rlxcache.rlx
diff --git a/tex/context/base/rlxtools.rlx b/tex/context/modules/mkii/rlxtools.rlx
index b230c6d5b..b230c6d5b 100644
--- a/tex/context/base/rlxtools.rlx
+++ b/tex/context/modules/mkii/rlxtools.rlx
diff --git a/tex/context/base/s-chi-00.mkii b/tex/context/modules/mkii/s-chi-00.mkii
index fb8d47603..fb8d47603 100644
--- a/tex/context/base/s-chi-00.mkii
+++ b/tex/context/modules/mkii/s-chi-00.mkii
diff --git a/tex/context/base/s-fnt-01.mkii b/tex/context/modules/mkii/s-fnt-01.mkii
index aedcf913d..aedcf913d 100644
--- a/tex/context/base/s-fnt-01.mkii
+++ b/tex/context/modules/mkii/s-fnt-01.mkii
diff --git a/tex/context/base/s-fnt-02.mkii b/tex/context/modules/mkii/s-fnt-02.mkii
index 69f976102..69f976102 100644
--- a/tex/context/base/s-fnt-02.mkii
+++ b/tex/context/modules/mkii/s-fnt-02.mkii
diff --git a/tex/context/base/s-grk-00.mkii b/tex/context/modules/mkii/s-grk-00.mkii
index f76d0c220..f76d0c220 100644
--- a/tex/context/base/s-grk-00.mkii
+++ b/tex/context/modules/mkii/s-grk-00.mkii
diff --git a/tex/context/base/s-jap-00.mkii b/tex/context/modules/mkii/s-jap-00.mkii
index 5eec2f725..5eec2f725 100644
--- a/tex/context/base/s-jap-00.mkii
+++ b/tex/context/modules/mkii/s-jap-00.mkii
diff --git a/tex/context/base/s-map-10.mkii b/tex/context/modules/mkii/s-map-10.mkii
index 3446a214c..3446a214c 100644
--- a/tex/context/base/s-map-10.mkii
+++ b/tex/context/modules/mkii/s-map-10.mkii
diff --git a/tex/context/base/s-mod-00.mkii b/tex/context/modules/mkii/s-mod-00.mkii
index a81406a73..a81406a73 100644
--- a/tex/context/base/s-mod-00.mkii
+++ b/tex/context/modules/mkii/s-mod-00.mkii
diff --git a/tex/context/base/s-mod-01.mkii b/tex/context/modules/mkii/s-mod-01.mkii
index 5b83cd121..5b83cd121 100644
--- a/tex/context/base/s-mod-01.mkii
+++ b/tex/context/modules/mkii/s-mod-01.mkii
diff --git a/tex/context/base/s-mod-02.mkii b/tex/context/modules/mkii/s-mod-02.mkii
index 2d095ff9a..2d095ff9a 100644
--- a/tex/context/base/s-mod-02.mkii
+++ b/tex/context/modules/mkii/s-mod-02.mkii
diff --git a/tex/context/base/s-pre-17.mkii b/tex/context/modules/mkii/s-pre-17.mkii
index 7e8310a53..7e8310a53 100644
--- a/tex/context/base/s-pre-17.mkii
+++ b/tex/context/modules/mkii/s-pre-17.mkii
diff --git a/tex/context/base/s-pre-30.mkii b/tex/context/modules/mkii/s-pre-30.mkii
index a7152deb6..a7152deb6 100644
--- a/tex/context/base/s-pre-30.mkii
+++ b/tex/context/modules/mkii/s-pre-30.mkii
diff --git a/tex/context/base/s-pre-60.mkii b/tex/context/modules/mkii/s-pre-60.mkii
index 8823c66ce..8823c66ce 100644
--- a/tex/context/base/s-pre-60.mkii
+++ b/tex/context/modules/mkii/s-pre-60.mkii
diff --git a/tex/context/base/s-pre-71.mkii b/tex/context/modules/mkii/s-pre-71.mkii
index 343136768..343136768 100644
--- a/tex/context/base/s-pre-71.mkii
+++ b/tex/context/modules/mkii/s-pre-71.mkii
diff --git a/tex/context/base/s-ptj-01.tex b/tex/context/modules/mkii/s-ptj-01.mkii
index a14a03ef1..a14a03ef1 100644
--- a/tex/context/base/s-ptj-01.tex
+++ b/tex/context/modules/mkii/s-ptj-01.mkii
diff --git a/tex/context/base/s-syntax.mkii b/tex/context/modules/mkii/s-syntax.mkii
index 6d1d59697..6d1d59697 100644
--- a/tex/context/base/s-syntax.mkii
+++ b/tex/context/modules/mkii/s-syntax.mkii
diff --git a/tex/context/base/x-calcmath.mkii b/tex/context/modules/mkii/x-calcmath.mkii
index a649aa648..a649aa648 100644
--- a/tex/context/base/x-calcmath.mkii
+++ b/tex/context/modules/mkii/x-calcmath.mkii
diff --git a/tex/context/base/x-chemml.mkii b/tex/context/modules/mkii/x-chemml.mkii
index 08d64e54b..08d64e54b 100644
--- a/tex/context/base/x-chemml.mkii
+++ b/tex/context/modules/mkii/x-chemml.mkii
diff --git a/tex/context/base/x-chemml.xsd b/tex/context/modules/mkii/x-chemml.xsd
index b51121911..b51121911 100644
--- a/tex/context/base/x-chemml.xsd
+++ b/tex/context/modules/mkii/x-chemml.xsd
diff --git a/tex/context/base/x-contml.mkii b/tex/context/modules/mkii/x-contml.mkii
index 22fffa50a..22fffa50a 100644
--- a/tex/context/base/x-contml.mkii
+++ b/tex/context/modules/mkii/x-contml.mkii
diff --git a/tex/context/base/x-contml.xsd b/tex/context/modules/mkii/x-contml.xsd
index 3b71e31e8..3b71e31e8 100644
--- a/tex/context/base/x-contml.xsd
+++ b/tex/context/modules/mkii/x-contml.xsd
diff --git a/tex/context/base/x-corres.mkii b/tex/context/modules/mkii/x-corres.mkii
index effd79a5b..effd79a5b 100644
--- a/tex/context/base/x-corres.mkii
+++ b/tex/context/modules/mkii/x-corres.mkii
diff --git a/tex/context/base/x-corres.rng b/tex/context/modules/mkii/x-corres.rng
index 09de5d267..09de5d267 100644
--- a/tex/context/base/x-corres.rng
+++ b/tex/context/modules/mkii/x-corres.rng
diff --git a/tex/context/base/x-dir-01.tex b/tex/context/modules/mkii/x-dir-01.mkii
index 6e4192a13..6e4192a13 100644
--- a/tex/context/base/x-dir-01.tex
+++ b/tex/context/modules/mkii/x-dir-01.mkii
diff --git a/tex/context/modules/mkii/x-dir-02.mkii b/tex/context/modules/mkii/x-dir-02.mkii
new file mode 100644
index 000000000..90c32d704
--- /dev/null
+++ b/tex/context/modules/mkii/x-dir-02.mkii
@@ -0,0 +1,130 @@
+%D \module
+%D   [      file=x-dir-02,
+%D        version=2003.05.10, % around that time -)
+%D          title=\CONTEXT\ Directory Handling,
+%D       subtitle=Overview (2),
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\setuplayout
+  [width=middle,
+   height=middle,
+   backspace=.5cm,
+   topspace=.5cm,
+   header=1cm,
+   footer=0cm]
+
+\definehead
+  [directory]
+  [subject]
+
+\setuphead
+  [directory]
+  [style=\tfa]
+
+\setupbodyfont
+  [tt]
+
+\setuptabulate
+  [before=,after=]
+
+\setupcombinations
+  [location=top]
+
+\defineXMLenvironment [files] [root=.,url=]
+  {\doifelsenothing{\XMLop{url}}
+     {\xdef\XMLDIRurl{}}
+     {\xdef\XMLDIRurl{\XMLop{url}/}}
+   \startXMLignore}
+  {\stopXMLignore}
+
+\newcounter\NOfEntries
+
+\startsetups[xmldir:file:normal]
+
+  \doglobal\increment\NOfEntries
+
+  \startfiguretext
+    [left,none]
+    []
+    {}
+    {\hbox
+       {\externalfigure
+          [\XMLpar{files}{root}{.}/\XMLpar{directory}{name}{.}/\XMLop{name}]
+          [frame=on,width=6cm]
+        \quad
+        \framed[width=\figurewidth,height=\figureheight]{}}}
+    \strut \vskip-\lineheight
+    \starttabulate[|l|l|]
+      \NC base   \NC \XMLflush{base}                    \NC \NR
+      \NC type   \NC \XMLflush{type}                    \NC \NR
+      \NC width  \NC \figurenaturalwidth                \NC \NR
+      \NC height \NC \figurenaturalheight               \NC \NR
+      \NC date   \NC \XMLflush{date}                    \NC \NR
+      \NC size   \NC \XMLflush{size}                    \NC \NR
+    \stoptabulate
+  \stopfiguretext
+
+\stopsetups
+
+\startsetups[xmldir:file:small]
+
+  \doglobal\increment\NOfEntries
+
+  \startlinecorrection
+
+  \startcombination
+    {\externalfigure
+       [\XMLpar{files}{root}{.}/\XMLpar{directory}{name}{.}/\XMLop{name}]
+       [frame=on,width=3cm]}
+    {}
+    {\vbox{\starttabulate[|l|l|]
+       \NC base \NC \XMLflush{base} \NC \NR
+       \NC type \NC \XMLflush{type} \NC \NR
+       \NC date \NC \XMLflush{date} \NC \NR
+     \stoptabulate}}
+    {}
+  \stopcombination
+
+  \stoplinecorrection
+
+\stopsetups
+
+\defineXMLenvironment [directory] [name=]
+  {\directory{Path \XMLop{name}}}
+  {}
+
+\defineXMLenvironment [file] [name=]
+  {\bgroup}
+  {% the next quick hack is really needed
+   \expanded{\defconvertedargument\noexpand\asciia{./\jobfilename}.pdf}%
+   \expanded{\defconvertedargument\noexpand\asciib{\XMLpar{directory}{name}{.}/\XMLop{name}}}%
+   % else we can not do an overview of the curent path
+   \doifnot\asciia\asciib
+     {\doifmodeelse{alternative-small}
+        {\setups[xmldir:file:small]}
+        {\setups[xmldir:file:normal]}
+      \endgraf}
+   \egroup}
+
+\defineXMLsave[base]
+\defineXMLsave[type]
+\defineXMLsave[size]
+\defineXMLsave[date]
+
+\starttext
+
+  \doifmode{alternative-small}{\startcolumns[balance=no]}
+
+  \processXMLfilegrouped{\inputfilename}
+
+  \doifmode{alternative-small}{\stopcolumns}
+
+  \ifnum\NOfEntries=0 There are no files found that match the pattern. \fi
+
+\stoptext
diff --git a/tex/context/base/x-dir-05.mkii b/tex/context/modules/mkii/x-dir-05.mkii
index 53e73c5eb..53e73c5eb 100644
--- a/tex/context/base/x-dir-05.mkii
+++ b/tex/context/modules/mkii/x-dir-05.mkii
diff --git a/tex/context/base/x-fdf-00.mkii b/tex/context/modules/mkii/x-fdf-00.mkii
index fd4bea7e7..fd4bea7e7 100644
--- a/tex/context/base/x-fdf-00.mkii
+++ b/tex/context/modules/mkii/x-fdf-00.mkii
diff --git a/tex/context/base/x-fe.mkii b/tex/context/modules/mkii/x-fe.mkii
index dcf415850..dcf415850 100644
--- a/tex/context/base/x-fe.mkii
+++ b/tex/context/modules/mkii/x-fe.mkii
diff --git a/tex/context/base/x-fig-00.dtd b/tex/context/modules/mkii/x-fig-00.dtd
index 34b4d0bef..34b4d0bef 100644
--- a/tex/context/base/x-fig-00.dtd
+++ b/tex/context/modules/mkii/x-fig-00.dtd
diff --git a/tex/context/base/x-fig-00.mkii b/tex/context/modules/mkii/x-fig-00.mkii
index 2e000c64c..2e000c64c 100644
--- a/tex/context/base/x-fig-00.mkii
+++ b/tex/context/modules/mkii/x-fig-00.mkii
diff --git a/tex/context/base/x-fig-00.xsd b/tex/context/modules/mkii/x-fig-00.xsd
index 615841a1e..615841a1e 100644
--- a/tex/context/base/x-fig-00.xsd
+++ b/tex/context/modules/mkii/x-fig-00.xsd
diff --git a/tex/context/base/x-fig-01.mkii b/tex/context/modules/mkii/x-fig-01.mkii
index 5a2ea20c8..5a2ea20c8 100644
--- a/tex/context/base/x-fig-01.mkii
+++ b/tex/context/modules/mkii/x-fig-01.mkii
diff --git a/tex/context/base/x-fig-02.mkii b/tex/context/modules/mkii/x-fig-02.mkii
index a8232fba9..a8232fba9 100644
--- a/tex/context/base/x-fig-02.mkii
+++ b/tex/context/modules/mkii/x-fig-02.mkii
diff --git a/tex/context/base/x-fig-03.mkii b/tex/context/modules/mkii/x-fig-03.mkii
index c7f03453e..c7f03453e 100644
--- a/tex/context/base/x-fig-03.mkii
+++ b/tex/context/modules/mkii/x-fig-03.mkii
diff --git a/tex/context/base/x-fo.mkii b/tex/context/modules/mkii/x-fo.mkii
index 3631f6d7e..2c1ac0d96 100644
--- a/tex/context/base/x-fo.mkii
+++ b/tex/context/modules/mkii/x-fo.mkii
@@ -3834,7 +3834,7 @@ text-indent=0pt, % yes
 %D Graphics: static frames
 
 \startMPinclusions
-  input mp-fobg.mp ;
+  input mp-fobg.mpii ;
 \stopMPinclusions
 
 \def\unknownMPcolor{FoNoColor}
diff --git a/tex/context/base/x-foxet.mkii b/tex/context/modules/mkii/x-foxet.mkii
index d44cf2b7e..d44cf2b7e 100644
--- a/tex/context/base/x-foxet.mkii
+++ b/tex/context/modules/mkii/x-foxet.mkii
diff --git a/tex/context/base/x-mathml.mkii b/tex/context/modules/mkii/x-mathml.mkii
index ccb9fa054..ccb9fa054 100644
--- a/tex/context/base/x-mathml.mkii
+++ b/tex/context/modules/mkii/x-mathml.mkii
diff --git a/tex/context/base/x-mathml.xsd b/tex/context/modules/mkii/x-mathml.xsd
index 1c29452b0..1c29452b0 100644
--- a/tex/context/base/x-mathml.xsd
+++ b/tex/context/modules/mkii/x-mathml.xsd
diff --git a/tex/context/base/x-newcml.mkii b/tex/context/modules/mkii/x-newcml.mkii
index 23c2bf1e2..23c2bf1e2 100644
--- a/tex/context/base/x-newcml.mkii
+++ b/tex/context/modules/mkii/x-newcml.mkii
diff --git a/tex/context/base/x-newmme.mkii b/tex/context/modules/mkii/x-newmme.mkii
index 2e0d4c189..2e0d4c189 100644
--- a/tex/context/base/x-newmme.mkii
+++ b/tex/context/modules/mkii/x-newmme.mkii
diff --git a/tex/context/base/x-newmml.mkii b/tex/context/modules/mkii/x-newmml.mkii
index e777edca1..e777edca1 100644
--- a/tex/context/base/x-newmml.mkii
+++ b/tex/context/modules/mkii/x-newmml.mkii
diff --git a/tex/context/base/x-newmmo.mkii b/tex/context/modules/mkii/x-newmmo.mkii
index 97fdeb06c..97fdeb06c 100644
--- a/tex/context/base/x-newmmo.mkii
+++ b/tex/context/modules/mkii/x-newmmo.mkii
diff --git a/tex/context/base/x-newpml.mkii b/tex/context/modules/mkii/x-newpml.mkii
index ea3bae182..ea3bae182 100644
--- a/tex/context/base/x-newpml.mkii
+++ b/tex/context/modules/mkii/x-newpml.mkii
diff --git a/tex/context/base/x-om2cml.xsl b/tex/context/modules/mkii/x-om2cml.xsl
index 4070d94dc..4070d94dc 100644
--- a/tex/context/base/x-om2cml.xsl
+++ b/tex/context/modules/mkii/x-om2cml.xsl
diff --git a/tex/context/base/x-openmath.mkii b/tex/context/modules/mkii/x-openmath.mkii
index 38474996e..38474996e 100644
--- a/tex/context/base/x-openmath.mkii
+++ b/tex/context/modules/mkii/x-openmath.mkii
diff --git a/tex/context/base/x-openmath.xsl b/tex/context/modules/mkii/x-openmath.xsl
index ffb404939..ffb404939 100644
--- a/tex/context/base/x-openmath.xsl
+++ b/tex/context/modules/mkii/x-openmath.xsl
diff --git a/tex/context/base/x-physml.mkii b/tex/context/modules/mkii/x-physml.mkii
index 4d9cffe33..4d9cffe33 100644
--- a/tex/context/base/x-physml.mkii
+++ b/tex/context/modules/mkii/x-physml.mkii
diff --git a/tex/context/base/x-physml.xsd b/tex/context/modules/mkii/x-physml.xsd
index 865d88c58..865d88c58 100644
--- a/tex/context/base/x-physml.xsd
+++ b/tex/context/modules/mkii/x-physml.xsd
diff --git a/tex/context/base/x-res-00.mkii b/tex/context/modules/mkii/x-res-00.mkii
index d031e1453..d031e1453 100644
--- a/tex/context/base/x-res-00.mkii
+++ b/tex/context/modules/mkii/x-res-00.mkii
diff --git a/tex/context/base/x-res-01.mkii b/tex/context/modules/mkii/x-res-01.mkii
index 41580a0b8..41580a0b8 100644
--- a/tex/context/base/x-res-01.mkii
+++ b/tex/context/modules/mkii/x-res-01.mkii
diff --git a/tex/context/base/x-res-02.mkii b/tex/context/modules/mkii/x-res-02.mkii
index f8502dbac..f8502dbac 100644
--- a/tex/context/base/x-res-02.mkii
+++ b/tex/context/modules/mkii/x-res-02.mkii
diff --git a/tex/context/base/x-res-03.mkii b/tex/context/modules/mkii/x-res-03.mkii
index 15f2620c1..15f2620c1 100644
--- a/tex/context/base/x-res-03.mkii
+++ b/tex/context/modules/mkii/x-res-03.mkii
diff --git a/tex/context/base/x-res-04.mkii b/tex/context/modules/mkii/x-res-04.mkii
index b22e9ffa4..b22e9ffa4 100644
--- a/tex/context/base/x-res-04.mkii
+++ b/tex/context/modules/mkii/x-res-04.mkii
diff --git a/tex/context/base/x-res-08.mkii b/tex/context/modules/mkii/x-res-08.mkii
index 0805f071f..0805f071f 100644
--- a/tex/context/base/x-res-08.mkii
+++ b/tex/context/modules/mkii/x-res-08.mkii
diff --git a/tex/context/base/x-res-09.mkii b/tex/context/modules/mkii/x-res-09.mkii
index e3354e9a4..e3354e9a4 100644
--- a/tex/context/base/x-res-09.mkii
+++ b/tex/context/modules/mkii/x-res-09.mkii
diff --git a/tex/context/base/x-res-10.mkii b/tex/context/modules/mkii/x-res-10.mkii
index 833bce776..833bce776 100644
--- a/tex/context/base/x-res-10.mkii
+++ b/tex/context/modules/mkii/x-res-10.mkii
diff --git a/tex/context/base/x-res-11.mkii b/tex/context/modules/mkii/x-res-11.mkii
index 84157be88..84157be88 100644
--- a/tex/context/base/x-res-11.mkii
+++ b/tex/context/modules/mkii/x-res-11.mkii
diff --git a/tex/context/base/x-res-12.mkii b/tex/context/modules/mkii/x-res-12.mkii
index 81761ae9a..81761ae9a 100644
--- a/tex/context/base/x-res-12.mkii
+++ b/tex/context/modules/mkii/x-res-12.mkii
diff --git a/tex/context/base/x-res-20.mkii b/tex/context/modules/mkii/x-res-20.mkii
index 0bc1358ec..0bc1358ec 100644
--- a/tex/context/base/x-res-20.mkii
+++ b/tex/context/modules/mkii/x-res-20.mkii
diff --git a/tex/context/base/x-res-50.mkii b/tex/context/modules/mkii/x-res-50.mkii
index 3c3e758a7..3c3e758a7 100644
--- a/tex/context/base/x-res-50.mkii
+++ b/tex/context/modules/mkii/x-res-50.mkii
diff --git a/tex/context/base/x-sch-00.mkii b/tex/context/modules/mkii/x-sch-00.mkii
index 5b4da0825..5b4da0825 100644
--- a/tex/context/base/x-sch-00.mkii
+++ b/tex/context/modules/mkii/x-sch-00.mkii
diff --git a/tex/context/base/x-sch-01.mkii b/tex/context/modules/mkii/x-sch-01.mkii
index 5bdf088fe..5bdf088fe 100644
--- a/tex/context/base/x-sch-01.mkii
+++ b/tex/context/modules/mkii/x-sch-01.mkii
diff --git a/tex/context/base/x-set-01.mkii b/tex/context/modules/mkii/x-set-01.mkii
index 814ea5fc6..814ea5fc6 100644
--- a/tex/context/base/x-set-01.mkii
+++ b/tex/context/modules/mkii/x-set-01.mkii
diff --git a/tex/context/base/x-set-02.mkii b/tex/context/modules/mkii/x-set-02.mkii
index 7a2cd7701..7a2cd7701 100644
--- a/tex/context/base/x-set-02.mkii
+++ b/tex/context/modules/mkii/x-set-02.mkii
diff --git a/tex/context/base/x-set-11.mkii b/tex/context/modules/mkii/x-set-11.mkii
index 8c8f614a5..8c8f614a5 100644
--- a/tex/context/base/x-set-11.mkii
+++ b/tex/context/modules/mkii/x-set-11.mkii
diff --git a/tex/context/base/x-set-12.mkii b/tex/context/modules/mkii/x-set-12.mkii
index c2aa265c3..c2aa265c3 100644
--- a/tex/context/base/x-set-12.mkii
+++ b/tex/context/modules/mkii/x-set-12.mkii
diff --git a/tex/context/base/x-sm2om.xsl b/tex/context/modules/mkii/x-sm2om.xsl
index 93e1a12c5..93e1a12c5 100644
--- a/tex/context/base/x-sm2om.xsl
+++ b/tex/context/modules/mkii/x-sm2om.xsl
diff --git a/tex/context/base/x-steps.mkii b/tex/context/modules/mkii/x-steps.mkii
index 47141699a..47141699a 100644
--- a/tex/context/base/x-steps.mkii
+++ b/tex/context/modules/mkii/x-steps.mkii
diff --git a/tex/context/base/x-xml-01.mkii b/tex/context/modules/mkii/x-xml-01.mkii
index 95ce51fc8..95ce51fc8 100644
--- a/tex/context/base/x-xml-01.mkii
+++ b/tex/context/modules/mkii/x-xml-01.mkii
diff --git a/tex/context/base/x-xml-02.mkii b/tex/context/modules/mkii/x-xml-02.mkii
index e33ab9ee4..e33ab9ee4 100644
--- a/tex/context/base/x-xml-02.mkii
+++ b/tex/context/modules/mkii/x-xml-02.mkii
diff --git a/tex/context/base/x-xml-11.mkii b/tex/context/modules/mkii/x-xml-11.mkii
index 047561370..047561370 100644
--- a/tex/context/base/x-xml-11.mkii
+++ b/tex/context/modules/mkii/x-xml-11.mkii
diff --git a/tex/context/base/m-barcodes.mkiv b/tex/context/modules/mkiv/m-barcodes.mkiv
index e4c43b376..e4c43b376 100644
--- a/tex/context/base/m-barcodes.mkiv
+++ b/tex/context/modules/mkiv/m-barcodes.mkiv
diff --git a/tex/context/base/m-chart.lua b/tex/context/modules/mkiv/m-chart.lua
index f1e7f4cb9..f1e7f4cb9 100644
--- a/tex/context/base/m-chart.lua
+++ b/tex/context/modules/mkiv/m-chart.lua
diff --git a/tex/context/base/m-chart.mkvi b/tex/context/modules/mkiv/m-chart.mkvi
index a0c8b2244..a0c8b2244 100644
--- a/tex/context/base/m-chart.mkvi
+++ b/tex/context/modules/mkiv/m-chart.mkvi
diff --git a/tex/context/base/m-chemic.mkiv b/tex/context/modules/mkiv/m-chemic.mkiv
index 1dd403fae..1dd403fae 100644
--- a/tex/context/base/m-chemic.mkiv
+++ b/tex/context/modules/mkiv/m-chemic.mkiv
diff --git a/tex/context/modules/mkiv/m-cweb.mkiv b/tex/context/modules/mkiv/m-cweb.mkiv
new file mode 100644
index 000000000..2546b2342
--- /dev/null
+++ b/tex/context/modules/mkiv/m-cweb.mkiv
@@ -0,0 +1,1373 @@
+%D \module
+%D   [       file=m-cweb,
+%D        version=1997.01.15,
+%D          title=\CONTEXT\ Extra Modules,
+%D       subtitle=\CWEB\ Pretty Printing Macros,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This module has to be redone in the mkiv way.
+
+%D First some auxiliary stuff, to be moved to system module.
+
+\def\dodofindfirstcharacter#1%
+  {\ifx#1\relax
+     \let\next=\egroup
+   \else
+     \handlecase
+       {\expandafter\ifnum\expandafter\catcode\expandafter`#1=11
+        \def\next##1\relax{\egroup\def\firstcharacter{#1}}%
+     \fi}%
+   \fi
+   \next}
+
+\def\dofindfirstcharacter#1#2%
+  {\def\firstcharacter{}%
+   \bgroup
+   \defconvertedargument\ascii{#2}%
+   \let\next\dodofindfirstcharacter
+   \let\handlecase#1%
+   \expandafter\next\ascii\relax}
+
+\def\normalcase#1%
+  {#1}
+
+\def\findfirstcharacter%
+  {\dofindfirstcharacter\lowercase}
+
+\def\FindFirstCharacter%
+  {\dofindfirstcharacter\normalcase}
+
+\def\FINDFIRSTCHARACTER%
+  {\dofindfirstcharacter\uppercase}
+
+% nog doen:
+%
+% \deactivateCWEB in output routine
+% status info
+% gelinkte entries
+% parskip en parindent
+
+%D \gdef\CWEBquote#1.{{\em Quote :}\ #1.} % checks the .
+
+%D This module (re)implements the \CWEB\ macros as defined in
+%D the file \type{cwebmac.tex}.
+%D
+%D \CWEB\ uses short, often one character long, names for
+%D macros. This is no real problem because no one is supposed
+%D to read and understand the files generated by \CWEB. The
+%D standard macros are meant for \PLAIN\ \TEX\ users. In
+%D \CONTEXT\ and other macro packages however, there is a
+%D potential conflict with format specific or user defined
+%D commands. Furthermore, the \CWEB\ macros implement their own
+%D output routines. When integrating \CWEB\ documents in
+%D another environment, the \CWEB\ specific macros have to be
+%D made local. The first part of this module is dedicated to
+%D this feature.
+%D
+%D Instead of using \type{\def} and \type{\let} for defining
+%D macros, we use:
+%D
+%D \starttyping
+%D \defCEBmacro arguments {meaning}
+%D \letCEBmacro arguments {meaning}
+%D \stoptyping
+%D
+%D \CWEB files contain implicit calls to macros that generate
+%D the table of contents, the lists of sections and the index.
+%D Because we want to be much more flexible, we implemented our
+%D own alternatives, and therefore have to bypass the original
+%D ones. The next macro is used for defining these obsolete
+%D \CWEB\ macros. The dummies take care of arguments.
+%D
+%D \starttyping
+%D \defCEBdummy arguments {meaning}
+%D \stoptyping
+%D
+%D The list of \CWEB\ specific macro names is saved in a
+%D \TOKENLIST. This serves two purposes. First it enables us to
+%D activate the \CWEB\ macros, which are saved under a
+%D different name, second it can be used to temporary restore
+%D the meanings, for instance when the output routine builds
+%D the page.
+
+\newtoks\CWEBmacros
+
+%D Activating and deactivating is done by means of:
+%D
+%D \starttyping
+%D \activateCWEB
+%D \deactivateCWEB
+%D \stoptyping
+%D
+%D Which are implemented as:
+
+\def\activateCWEB%
+  {\let\doCWEB=\activateCWEBmacro
+   \the\CWEBmacros}
+
+\def\deactivateCWEB%
+  {\let\doCWEB=\deactivateCWEBmacro
+   \the\CWEBmacros}
+
+%D The three definition macros append the name of the macro to
+%D the list. The first two macros save the meaning, the last one
+%D assigns \type{{}} to the macro and gobbles original meaning.
+
+\long\def\defCWEBmacro#1%
+  {\appendtoks\doCWEB#1\to\CWEBmacros
+   \setvalue{newCWEB\string#1}}
+
+\long\def\letCWEBmacro#1%
+  {\appendtoks\doCWEB#1\to\CWEBmacros
+   \letvalue{newCWEB\string#1}}
+
+\long\def\defCWEBdummy#1#2#%
+  {\appendtoks\doCWEB#1\to\CWEBmacros
+   \setvalue{newCWEB\string#1}#2{}%
+   \gobbleoneargument}
+
+%D The macro \type{\defCWEBdummy} of course takes care of the
+%D argument. This leaves the two (de|)|activating macros:
+
+\def\CWEBmacro#1%
+  {\getvalue{newCWEB\string#1}}
+
+\def\activateCWEBmacro#1%
+  {\letvalue{oldCWEB\string#1}=#1%
+   \def#1{\CWEBmacro#1}}
+
+\def\deactivateCWEBmacro#1%
+  {\expandafter\let\expandafter#1\expandafter=\csname oldCWEB\string#1\endcsname}
+
+%D I did consider loading the \CWEB\ macros using temporary
+%D substitutes of \type{\def}, \type{\font}, \type{\newbox} etc.
+%D The main problem is that the file contains more than
+%D definitions and taking all kind of assignments into account
+%D too would not make things easier. So I decided to stick to
+%D the method as just described.
+
+%D Now we're ready for the real job. What follows is a partial
+%D adaption of the file \type{cwebmac.tex}, version 3.1, dated
+%D September 1994 and written by Levy and Knuth. When possible
+%D we kept the original meaning, but we've granted ourselves
+%D the freedom to reformat the macro's for readibility.
+%D
+%D We'll only present the macros we actually use. The source
+%D however contains the original implementation.
+
+% standard macros for CWEB listings (in addition to plain.tex)
+% Version 3.1 --- September 1994.
+%
+% \ifx\documentstyle\undefined\else\endinput\fi % LaTeX will use other macros
+%
+% \xdef\fmtversion{\fmtversion+CWEB3.1}
+
+%D \macros{.}{}
+%D
+%D \CWEBquote preserve a way to get the dot accent (all
+%D other accents will still work as usual).
+
+\letCWEBmacro\: = \.
+
+% \parskip   = 0pt % no stretch between paragraphs
+% \parindent = 1em % for paragraphs and for the first line of C text
+
+% \font\ninerm           = cmr9
+% \let\mc                = \ninerm                 % medium caps
+% \font\eightrm          = cmr8
+% \let\sc                = \eightrm                % small caps (NOT a caps-and-small-caps font)
+% \let\mainfont          = \tenrm
+% \let\cmntfont          = \tenrm
+% \font\tenss            = cmss10
+% \let\cmntfont          = \tenss                  % alternative comment font
+% \font\titlefont        = cmr7 scaled \magstep4   % title on the contents page
+% \font\ttitlefont       = cmtt10 scaled \magstep2 % typewriter type in title
+% \font\tentex           = cmtex10                 % TeX extended character set (used in strings)
+% \fontextraspace\tentex = 0pt                     % no double space after sentences
+
+%D \macros{mc,sc,cmntfont,eightrm}{}
+%D
+%D The naming of the fonts in in line with those in \PLAIN\
+%D \TEX. Although \CONTEXT\ implements its own scheme, there is
+%D still support for the \PLAIN\ ones. We keep the original
+%D names, but change their meaning. That way the macros obey
+%D switching to other sizes or styles.
+
+\defCWEBmacro\mc       {\tx}
+\defCWEBmacro\sc       {\txx}
+\defCWEBmacro\cmntfont {\ss}
+\defCWEBmacro\eightrm  {\tx}
+
+%D \macros{tentex,sevenrm,sevensy,teni}{}
+%D
+%D The next one uses a temporary solution. The \type{cmtex10}
+%D font is not part of the default mechanism. We make use of
+%D the \CONTEXT\ variables \type{\textface}, \type{\scriptface}
+%D and \type{\scriptscriptface}, which hold the current
+%D sizes.
+
+\defCWEBmacro\tentex%
+  {\font\next=cmtex10 at \textface
+   \fontextraspace\next\zeropoint
+   \next}
+
+\defCWEBmacro\sevenrm  {\getvalue{\scriptface rmtf}}
+\defCWEBmacro\sevensy  {\getvalue{\scriptface mmsy}}
+\defCWEBmacro\teni     {\getvalue{\textface   mmmi}}
+
+%D \macros{CWEBpt}{}
+%D
+%D The original macros are based on a 10~point bodyfont size. We
+%D therefore have to specify dimension in points a bit
+%D different. Specifications like .6pt are changed to
+%D \type{.06} times \type{\bodyfontsize}.
+
+\defCWEBmacro\CWEBpt   {\bodyfontsize} % still dutch
+
+%D \macros{CEE,UNIX,TEX,CPLUSPLUS}{}
+%D
+%D Next come some logo's. It does not make much sense to use
+%D the \CONTEXT\ logo mechanism here, so we simply say:
+
+\defCWEBmacro      \CEE/{{\mc C\spacefactor1000}}
+\defCWEBmacro     \UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
+\defCWEBmacro      \TEX/{\TeX}
+\defCWEBmacro\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
+\defCWEBmacro       \Cee{\CEE/} % for backward compatibility
+
+%D \macros{\ }{}
+%D
+%D Now we come to the real work: the short commands that make
+%D up the typography.
+%D
+%D \CWEBquote italic type for identifiers.
+
+\defCWEBmacro\\#1%
+  {\leavevmode\hbox{\it#1\/\kern.05em}}
+
+%D \macros{\string|}{}
+%D
+%D \CWEBquote one letter identifiers look better this way.
+
+\defCWEBmacro\|#1%
+  {\leavevmode\hbox{$#1$}}
+
+%D \macros{\string\&}{}
+%D
+%D \CWEBquote boldface type for reserved words.
+
+\defCWEBmacro\&#1%
+  {\leavevmode
+   \hbox
+     {\def\_%
+        {\kern.04em
+         \vbox{\hrule width.3em height .06\CWEBpt}% .6pt}%
+         \kern.08em}%
+      \bf#1\/\kern.05em}}
+
+%D \macros{.}{}
+%D
+%D Here we use the previously saved period. This macro
+%D takes care of special characters in strings.
+
+\defCWEBmacro\.#1%
+  {\leavevmode
+    \hbox
+      {\tentex    % typewriter type for strings
+       \let\\=\BS % backslash in a string
+       \let\{=\LB % left brace in a string
+       \let\}=\RB % right brace in a string
+       \let\~=\TL % tilde in a string
+       \let\ =\SP % space in a string
+       \let\_=\UL % underline in a string
+       \let\&=\AM % ampersand in a string
+       \let\^=\CF % circumflex in a string
+       #1\kern.05em}}
+
+%D \macros{)}{}
+%D
+%D Some discretionary hack.
+
+\defCWEBmacro\)%
+  {\discretionary{\hbox{\tentex\BS}}{}{}}
+
+%D \macros{AT}{}
+%D
+%D \CWEBquote at sign for control text (not needed in versions
+%D $>=$ 2.9).
+
+\defCWEBmacro\AT{@}
+
+%D \macros{ATL,postATL,NOATL}{}
+%D
+%D A two step macro that handles whatever.
+
+\defCWEBmacro\ATL%
+  {\par
+   \noindent
+   \bgroup
+   \catcode`\_=12
+   \postATL}
+
+\defCWEBmacro\postATL#1 #2 %
+  {\bf letter \\{\uppercase{\char"#1}} tangles as \tentex "#2"%
+   \egroup
+   \par}
+
+\defCWEBmacro\noATL#1 #2 %
+  {}
+
+%D \macros{noatl}{}
+%D
+%D \CWEBquote suppress output from \type{@l}.
+
+\defCWEBmacro\noatl%
+  {\let\ATL=\noATL}
+
+% \defCWEBmacro\ATH%
+%   {\X\kern-.5em:Preprocessor definitions\X}
+
+%D \macros{PB}
+%D
+%D \CWEBquote hook for program brackets {\tttf\string|...\string|}
+%D in TeX part or  section name.
+
+\defCWEBmacro\PB%
+  {\relax}
+
+% \chardef\AM = `\&  % ampersand character in a string
+% \chardef\BS = `\\  % backslash in a string
+% \chardef\LB = `\{  % left brace in a string
+% \chardef\RB = `\}  % right brace in a string
+% \chardef\TL = `\~  % tilde in a string
+% \chardef\UL = `\_  % underline character in a string
+% \chardef\CF = `\^  % circumflex character in a string
+
+\defCWEBmacro\AM {\char`\&}      % ampersand character in a string
+\defCWEBmacro\BS {\char`\\}      % backslash in a string
+\defCWEBmacro\LB {\char`\{}      % left brace in a string
+\defCWEBmacro\RB {\char`\}}      % right brace in a string
+\defCWEBmacro\TL {\char`\~}      % tilde in a string
+\defCWEBmacro\UL {\char`\_}      % underline character in a string
+\defCWEBmacro\CF {\char`\^}      % circumflex character in a string
+
+\defCWEBmacro\SP {{\tt\char`\ }} % (visible) space in a string
+
+% \newbox\PPbox  \setbox\PPbox=\hbox
+%   {\kern.5pt\raise1pt\hbox{\sevenrm+\kern-1pt+}\kern.5pt}
+% \newbox\MMbox  \setbox\MMbox=\hbox
+%   {\kern.5pt\raise1pt\hbox{\sevensy\char0\kern-1pt\char0}\kern.5pt}
+% \newbox\MGbox  \setbox\MGbox=\hbox % symbol for ->
+%   {\kern-2pt\lower3pt\hbox{\teni\char'176}\kern1pt}
+% \newbox\MODbox \setbox\MODbox=\hbox
+%   {\eightrm\%}
+%
+% \def\PP  {\copy\PPbox}
+% \def\MM  {\copy\MMbox}
+% \def\MG  {\copy\MGbox}
+% \def\MOD {\mathbin{\copy\MODbox}}
+
+\defCWEBmacro\PP% symbol for ++
+  {\kern.05\CWEBpt
+   \raise.1\CWEBpt\hbox{\sevenrm+\kern-.1\CWEBpt+}%
+   \kern.05\CWEBpt}
+
+\defCWEBmacro\MM%
+  {\kern.05\CWEBpt
+   \raise.1\CWEBpt\hbox{\sevensy\char0\kern-.1\CWEBpt\char0}%
+   \kern.05\CWEBpt}
+
+\defCWEBmacro\MG%
+  {\kern-.2\CWEBpt
+   \lower.3\CWEBpt\hbox{\teni\char'176}%
+   \kern .1\CWEBpt}
+
+\defCWEBmacro\MRL#1%
+  {\mathrel{\let\K==#1}}
+
+% \def\MRL#1%
+%   {\KK#1}
+% \def\KK#1#2%
+%   {\buildrel\;#1\over{#2}}
+
+\letCWEBmacro\GG   = \gg
+\letCWEBmacro\LL   = \ll
+\letCWEBmacro\NULL = \Lambda
+
+% \mathchardef\AND   = "2026     % bitwise and; also \& (unary operator)
+
+\defCWEBmacro\AND% redefines itself (funny)
+  {\mathchardef\AND="2026 \AND}  % bitwise and; also \& (unary operator)
+
+\letCWEBmacro\OR   = \mid                     % bitwise or
+\letCWEBmacro\XOR  = \oplus                   % bitwise exclusive or
+\defCWEBmacro\CM     {{\sim}}                 % bitwise complement
+\defCWEBmacro\MOD    {\mathbin{\eightrm\%}}
+\defCWEBmacro\DC     {\kern.1em{::}\kern.1em} % symbol for ::
+\defCWEBmacro\PA     {\mathbin{.*}}           % symbol for .*
+\defCWEBmacro\MGA    {\mathbin{\MG*}}         % symbol for ->*
+\defCWEBmacro\this   {\&{this}}
+
+% \newbox  \bak    % backspace one em
+% \newbox  \bakk   % backspace two ems
+%
+% \setbox\bak =\hbox to -1em{}
+% \setbox\bakk=\hbox to -2em{}
+
+\newcount\CWEBind  % current indentation in ems
+
+\defCWEBmacro\1%     indent one more notch
+  {\global\advance\CWEBind by 1
+   \hangindent\CWEBind em}
+
+\defCWEBmacro\2%     indent one less notch
+  {\global\advance\CWEBind by -1 }
+
+\defCWEBmacro\3#1%   optional break within a statement
+  {\hfil
+   \penalty#10
+   \hfilneg}
+
+\defCWEBmacro\4%   backspace one notch
+  {\hbox to -1em{}}
+
+\defCWEBmacro\5%   optional break
+  {\hfil
+   \penalty-1
+   \hfilneg
+   \kern2.5em
+   \hbox to -2em{}%
+   \ignorespaces}
+
+\defCWEBmacro\6%   forced break
+   {\ifmmode
+    \else
+      \par
+      \hangindent\CWEBind em
+      \noindent
+      \kern\CWEBind em
+      \hbox to -2em{}%
+      \ignorespaces
+    \fi}
+
+\defCWEBmacro\7%   forced break and a little extra space
+  {\Y
+   \6}
+
+\defCWEBmacro\8%   no indentation
+  {\hskip-\CWEBind em
+   \hskip 2em}
+
+\defCWEBmacro\9#1%
+  {}
+
+\newcount\gdepth  % depth of current major group, plus one
+\newcount\secpagedepth
+\secpagedepth=3   % page breaks will occur for depths -1, 0, and 1
+
+% \newtoks\gtitle % title of current major group
+% \newskip\intersecskip
+% \intersecskip=12pt minus 3pt % space between sections
+
+% \let\yskip=\smallskip
+
+\defCWEBmacro\?%
+  {\mathrel?}
+
+% \def\note#1#2.%
+%   {\Y\noindent
+%    {\hangindent2em\baselineskip10pt\eightrm#1~#2.\par}}
+
+\defCWEBmacro\lapstar%
+  {\rlap{*}}
+
+% \def\stsec%
+%   {\rightskip=0pt % get out of C mode (cf. \B)
+%    \sfcode`;=1500
+%    \pretolerance 200
+%    \hyphenpenalty 50
+%    \exhyphenpenalty 50
+%    \noindent{\let\*=\lapstar\bf\secstar.\quad}}
+%
+% \let\startsection=\stsec
+
+\defCWEBmacro\defin#1%
+  {\global\advance\CWEBind by 2 \1\&{#1 } } % begin `define' or `format'
+
+% \def\A% xref for doubly defined section name
+%   {\note{See also section}}
+%
+% \def\As% xref for multiply defined section name
+%   {\note{See also sections}}
+
+\defCWEBmacro\B%
+ {\rightskip=0pt plus 100pt minus 10pt % go into C mode
+  \sfcode`;=3000
+  \pretolerance 10000
+  \hyphenpenalty 1000 % so strings can be broken (discretionary \ is inserted)
+  \exhyphenpenalty 10000
+  \global\CWEBind=2 \1\ \unskip}
+
+\defCWEBmacro\C#1%
+  {\5\5\quad$/\ast\,${\cmntfont #1}$\,\ast/$}
+
+% \let\SHC\C % "// short comments" treated like "/* ordinary comments */"
+
+\defCWEBmacro\SHC#1%
+  {\5\5\quad$//\,${\cmntfont#1}}
+
+% \def\C#1{\5\5\quad$\triangleright\,${\cmntfont#1}$\,\triangleleft$}
+% \def\SHC#1{\5\5\quad$\diamond\,${\cmntfont#1}}
+
+\defCWEBmacro\D% macro definition
+  {\defin{\#define}}
+
+\letCWEBmacro\E=\equiv % equivalence sign
+
+% \def\ET% conjunction between two section numbers
+%   { and~}
+%
+% \def\ETs% conjunction between the last two of several section numbers
+%   {, and~}
+
+\defCWEBmacro\F% format definition
+  {\defin{format}}
+
+\letCWEBmacro\G = \ge % greater than or equal sign
+
+% \H is long Hungarian umlaut accent
+
+\letCWEBmacro\I = \ne % unequal sign
+
+\defCWEBmacro\J% TANGLE's join operation
+  {\.{@\&}}
+
+% \let\K== % assignment operator
+
+\letCWEBmacro\K = \leftarrow % "honest" alternative to standard assignment operator
+
+% \L is Polish letter suppressed-L
+
+% \outer\def\M#1%
+%   {\MN{#1}%
+%    \ifon
+%      \vfil
+%      \penalty-100
+%      \vfilneg % beginning of section
+%      \vskip\intersecskip
+%      \startsection
+%     \ignorespaces}
+%
+% \outer\def\N#1#2#3.%
+%   {\gdepth=#1%
+%    \gtitle={#3}%
+%    \MN{#2}% beginning of starred section
+%    \ifon
+%      \ifnum#1<\secpagedepth
+%        \vfil
+%        \eject % force page break if depth is small
+%      \else
+%        \vfil
+%        \penalty-100
+%        \vfilneg
+%        \vskip\intersecskip
+%      \fi
+%    \fi
+%    \message{*\secno}% progress report
+%    \edef\next%
+%      {\write\cont % write to contents file
+%         {\ZZ{#3}{#1}{\secno}{\noexpand\the\pageno}}}%
+%    \next % \ZZ{title}{depth}{sec}{page}
+%    \ifon
+%      \startsection
+%      {\bf#3.\quad}%
+%      \ignorespaces}
+%
+% \def\MN#1%
+%   {\par % common code for \M, \N
+%    {\xdef\secstar{#1}%
+%     \let\*=\empty
+%     \xdef\secno{#1}}% remove \* from section name
+%    \ifx\secno\secstar
+%      \onmaybe
+%    \else
+%      \ontrue
+%    \fi
+%    \mark{{{\tensy x}\secno}{\the\gdepth}{\the\gtitle}}}
+%
+% each \mark is {section reference or null}{depth plus 1}{group title}
+
+% \O is Scandinavian letter O-with-slash
+% \P is paragraph sign
+
+\defCWEBmacro\Q  {\note{This code is cited in section}}  % xref for mention of a section
+\defCWEBmacro\Qs {\note{This code is cited in sections}} % xref for mentions of a section
+
+% \S is section sign
+
+\defCWEBmacro\T#1%
+  {\leavevmode % octal, hex or decimal constant
+   \hbox
+     {$\def\?{\kern.2em}%
+      \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant
+      \def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
+      \let\~=\oct
+      \let\^=\hex
+      {#1}$}}
+
+\defCWEBmacro\U  {\note{This code is used in section}} % xref for use of a section
+\defCWEBmacro\Us {\note{This code is used in sections}} % xref for uses of a section
+
+\letCWEBmacro\R  = \lnot % logical not
+\letCWEBmacro\V  = \lor  % logical or
+\letCWEBmacro\W  = \land % logical and
+
+% defined later on
+%
+% \def\X#1:#2\X%
+%   {\ifmmode
+%      \gdef\XX{\null$\null}%
+%    \else
+%      \gdef\XX{}%
+%    \fi % section name
+%    \XX$\langle\,${#2\eightrm\kern.5em#1}$\,\rangle$\XX}
+
+\unprotect
+
+\def\theCWEByskip {\blank[\v!small]}
+\def\theCWEBvskip {\blank[\v!big]}
+
+\protect
+
+\defCWEBmacro\Y%
+  {\par
+   \yskip}
+
+\defCWEBmacro\yskip%
+  {\theCWEByskip}
+
+\letCWEBmacro\Z  = \le
+% \letCWEBmacro\ZZ = \let % now you can \write the control sequence \ZZ
+\letCWEBmacro\*  = *
+
+\defCWEBmacro\oct%
+  {\hbox{$^\circ$\kern-.1em\it\aftergroup\?\aftergroup}}
+
+\defCWEBmacro\hex%
+  {\hbox{$^{\scriptscriptstyle\#}$\tt\aftergroup}}
+
+\defCWEBmacro\vb#1%
+  {\leavevmode
+   \hbox
+     {\kern.2\CWEBpt
+      \vrule
+      \vtop
+        {\vbox
+           {\hrule
+            \hbox{\strut\kern.2\CWEBpt\.{#1}\kern.2\CWEBpt}}
+         \hrule}%
+      \vrule
+      \kern.2\CWEBpt}} % verbatim string
+
+\def\onmaybe%
+  {\let\ifon=\maybe}
+
+\let\maybe=\iftrue
+
+\newif\ifon
+
+% \newif\iftitle
+% \newif\ifpagesaved
+%
+% \def\lheader%
+%   {\mainfont
+%    \the\pageno
+%    \eightrm
+%    \qquad
+%    \grouptitle
+%    \hfill
+%    \title
+%    \qquad
+%    \mainfont
+%    \topsecno} % top line on left-hand pages
+%
+% \def\rheader%
+%   {\mainfont
+%    \topsecno
+%    \eightrm
+%    \qquad
+%    \title
+%    \hfill
+%    \grouptitle
+%    \qquad
+%    \mainfont
+%    \the\pageno} % top line on right-hand pages
+%
+% \def\grouptitle
+%   {\let\i=I
+%    \let\j=J
+%    \uppercase\expandafter{\expandafter\takethree\topmark}}
+%
+% \def\topsecno%
+%   {\expandafter\takeone\topmark}
+%
+% \def\takeone   #1#2#3{#1}
+% \def\taketwo   #1#2#3{#2}
+% \def\takethree #1#2#3{#3}
+%
+% \def\nullsec%
+%   {\eightrm
+%    \kern-2em} % the \kern-2em cancels \qquad in headers
+%
+% \let\page=\pagebody % \def\page {\box255 }
+% \raggedbottom       % \normalbottom % faster, but loses plain TeX footnotes
+%
+% \def\normaloutput#1#2#3%
+%   {\shipout\vbox
+%      {\ifodd
+%         \pageno
+%         \hoffset=\pageshift
+%       \fi
+%       \vbox to \fullpageheight
+%         {\iftitle
+%            \global\titlefalse
+%          \else
+%            \hbox to \pagewidth
+%              {\vbox to 10pt{}%
+%               \ifodd\pageno #3\else#2\fi}
+%          \fi
+%         \vfill#1}} % parameter #1 is the page itself
+%    \global\advance\pageno by 1}
+%
+% \gtitle={\.{CWEB} output} % this running head is reset by starred sections
+%
+% \mark{\noexpand\nullsec0{\the\gtitle}}
+%
+% \def\title%
+%   {\expandafter\uppercase\expandafter{\jobname}}
+%
+% \def\topofcontents%
+%   {\centerline{\titlefont\title}
+%    \vskip.7in
+%    \vfill} % this material will start the table of contents page
+
+\def\botofcontents%
+  {\vfill
+   \centerline{\covernote}} % this material will end the table of contents page
+
+\def\covernote%
+  {}
+
+% some leftover
+
+\defCWEBmacro\contentspagenumber{0} % default page number for table of contents
+
+% \newdimen\pagewidth      \pagewidth      = 158mm % the width of each page
+% \newdimen\pageheight     \pageheight     = 223mm % the height of each page
+% \newdimen\fullpageheight \fullpageheight = 240mm % page height including headlines
+% \newdimen\pageshift      \pageshift      = 0in   % shift righthand pages wrt lefthand ones
+%
+% \def\magnify#1%
+%   {\mag=#1
+%    \pagewidth=6.5truein
+%    \pageheight=8.7truein
+%    \fullpageheight=9truein
+%    \setpage}
+%
+% \def\setpage%
+%   {\hsize\pagewidth
+%    \vsize\pageheight} % use after changing page size
+%
+% \def\contentsfile  {\jobname.toc} % file that gets table of contents info
+% \def\readcontents  {\input \contentsfile}
+% \def\readindex     {\input \jobname.idx}
+% \def\readsections  {\input \jobname.scn}
+%
+% \newwrite\cont
+% \output{\setbox0=\page % the first page is garbage
+% \openout\cont=\contentsfile
+% \write\cont{\catcode `\noexpand\@=11\relax}   % \makeatletter
+% \global\output{\normaloutput\page\lheader\rheader}}
+% \setpage
+% \vbox to \vsize{} % the first \topmark won't be null
+
+\defCWEBdummy\magnify#1%  magnify the page
+  {}
+
+\defCWEBmacro\ch%
+  {\note{The following sections were changed by the change file:}
+   \let\*=\relax}
+
+% \newbox\sbox % saved box preceding the index
+% \newbox\lbox % lefthand column in the index
+%
+% \def\inx%
+%   {\par\vskip6pt plus 1fil % we are beginning the index
+%    \def\page{\box255 }
+%    \normalbottom
+%    \write\cont{} % ensure that the contents file isn't empty
+%    \write\cont{\catcode `\noexpand\@=12\relax}   % \makeatother
+%    \closeout\cont % the contents information has been fully gathered
+%    \output
+%      {\ifpagesaved
+%         \normaloutput{\box\sbox}\lheader\rheader
+%       \fi
+%       \global\setbox\sbox=\page
+%       \global\pagesavedtrue}
+%    \pagesavedfalse
+%    \eject % eject the page-so-far and predecessors
+%    \setbox\sbox\vbox{\unvbox\sbox} % take it out of its box
+%    \vsize=\pageheight
+%    \advance\vsize by -\ht\sbox % the remaining height
+%    \hsize=.5\pagewidth
+%    \advance\hsize by -10pt
+%    % column width for the index (20pt between cols)
+%    \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
+%    \def\lr{L} % this tells whether the left or right column is next
+%    \output
+%      {\if L\lr
+%         \global\setbox\lbox=\page
+%         \gdef\lr{R}
+%       \else
+%         \normaloutput
+%           {\vbox to\pageheight
+%              {\box\sbox
+%               \vss
+%               \hbox to\pagewidth{\box\lbox\hfil\page}}}
+%           \lheader
+%           \rheader
+%    \global\vsize\pageheight\gdef\lr{L}\global\pagesavedfalse\fi}
+%    \message{Index:}
+%    \parskip 0pt plus .5pt
+%    \outer\def\I##1, {\par\hangindent2em\noindent##1:\kern1em} % index entry
+%    \def\[##1]{$\underline{##1}$} % underlined index item
+%    \rm
+%    \rightskip0pt plus 2.5em
+%    \tolerance 10000
+%    \let\*=\lapstar
+%    \hyphenpenalty 10000
+%    \parindent0pt
+%    \readindex}
+%
+% \def\fin%
+%   {\par\vfill\eject % this is done when we are ending the index
+%    \ifpagesaved\null\vfill\eject\fi % output a null index column
+%    \if L\lr\else\null\vfill\eject\fi % finish the current page
+%    \parfillskip 0pt plus 1fil
+%    \def\grouptitle{NAMES OF THE SECTIONS}
+%    \let\topsecno=\nullsec
+%    \message{Section names:}
+%    \output={\normaloutput\page\lheader\rheader}
+%    \setpage
+%    \def\note##1##2.{\quad{\eightrm##1~##2.}}
+%    \def\Q{\note{Cited in section}} % crossref for mention of a section
+%    \def\Qs{\note{Cited in sections}} % crossref for mentions of a section
+%    \def\U{\note{Used in section}} % crossref for use of a section
+%    \def\Us{\note{Used in sections}} % crossref for uses of a section
+%    \def\I{\par\hangindent 2em}\let\*=*
+%    \readsections}
+%
+% \def\con%
+%   {\par\vfill\eject % finish the section names
+%    %\ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
+%    \rightskip     = 0pt
+%    \hyphenpenalty = 50
+%    \tolerance     = 200
+%    \setpage
+%    \output={\normaloutput\page\lheader\rheader}
+%    \titletrue % prepare to output the table of contents
+%    \pageno=\contentspagenumber
+%    \def\grouptitle{TABLE OF CONTENTS}
+%    \message{Table of contents:}
+%    \topofcontents
+%    \line{\hfil Section\hbox to3em{\hss Page}}
+%    \let\ZZ=\contentsline
+%    \readcontents\relax % read the contents info
+%    \botofcontents
+%    \end} % print the contents page(s) and terminate
+%
+% \def\contentsline#1#2#3#4%
+%   {\ifnum#2=0
+%      \smallbreak
+%    \fi
+%    \line{\consetup{#2}#1
+%    \rm\leaders\hbox to .5em{.\hfil}\hfil\ #3\hbox to3em{\hss#4}}}
+%
+
+\defCWEBmacro\consetup#1%
+  {\ifcase#1 \bf        % depth -1 (@**)
+   \or                  % depth  0 (@*)
+   \or       \hskip2em  % depth  1 (@*1)
+   \or       \hskip4em  % depth  2 (@*2)
+   \or       \hskip6em  % depth  3 (@*3)
+   \or       \hskip8em  % depth  4 (@*4)
+   \or       \hskip10em % depth  5 (@*5)
+   \else     \hskip12em
+   \fi}                 % depth  6 or more
+
+\defCWEBdummy \inx    {} % index
+\defCWEBdummy \fin    {} % finish
+\defCWEBdummy \con    {} % table of contents and finish
+
+\defCWEBdummy \noinx  {} % no indexes or table of contents
+\defCWEBdummy \nosecs {} % no index of section names or table of contents
+\defCWEBdummy \nocon  {} % no table of contents
+
+\defCWEBmacro\,%
+  {\relax
+   \ifmmode
+     \mskip\thinmuskip
+   \else
+     \thinspace
+   \fi}
+
+% \def\noinx%
+%   {\let\inx=\end}
+%
+% \def\nosecs%
+%   {\let\FIN=\fin
+%    \def\fin%
+%      {\let\parfillskip=\end
+%       \FIN}}
+%
+% \def\nocon%
+%   {\let\con=\end}
+%
+% \newcount\twodigits
+%
+% \def\hours%
+%   {\twodigits=\time
+%    \divide\twodigits by 60
+%    \printtwodigits
+%    \multiply\twodigits by -60
+%    \advance\twodigits by \time
+%    :\printtwodigits}
+%
+% \def\gobbleone1{}
+%
+% \def\printtwodigits%
+%   {\advance\twodigits by 100
+%    \expandafter\gobbleone\number\twodigits
+%    \advance\twodigits by -100 }
+%
+% \def\today%
+%   {\ifcase\month
+%    \or January\or February\or     March\or   April\or      May\or     June%
+%    \or    July\or   August\or September\or October\or November\or December%
+%    \fi
+%    \space
+%    \number\day, \number\year}
+%
+% \def\datethis%
+%   {\def\startsection%
+%      {\leftline{\sc\today\ at \hours}
+%       \bigskip
+%       \let\startsection=\stsec
+%       \stsec}}
+%
+% \def\datecontentspage%
+%   {\def\topofcontents%
+%      {\leftline{\sc\today\ at \hours}
+%        \bigskip
+%        \centerline{\titlefont\title}
+%        \vfill}}
+
+\defCWEBdummy\datethis         {} % say `\datethis' in limbo, to get your listing timestamped before section 1
+\defCWEBdummy\datecontentspage {} % timestamps the contents page
+
+\defCWEBmacro\TeX%
+  {{\ifmmode\it\fi
+    \leavevmode
+    \hbox{T\kern-.1667em\lower.424ex\hbox{E}\hskip-.125em X}}}
+
+% alternative implementation
+
+\newif\ifCWEBnotes
+
+\defCWEBmacro\Q  {\CWEBnotesfalse \note{This code is cited in section}}  % xref for mention of a section
+\defCWEBmacro\Qs {\CWEBnotestrue  \note{This code is cited in sections}} % xref for mentions of a section
+
+\defCWEBmacro\U  {\CWEBnotesfalse \note{This code is used in section}}  % xref for use of a section
+\defCWEBmacro\Us {\CWEBnotestrue  \note{This code is used in sections}} % xref for uses of a section
+
+\defCWEBmacro\A  {\CWEBnotesfalse \note{See also section}}  % xref for doubly defined section name
+\defCWEBmacro\As {\CWEBnotestrue  \note{See also sections}} % xref for multiply defined section name
+
+\defCWEBmacro\ET% conjunction between two section numbers
+  { and~}
+
+\defCWEBmacro\ETs% conjunction between the last two of several section numbers
+  {, and~}
+
+%\def\processCWEBsectionnumbers[#1]%
+%  {\bgroup
+%   \def\CWEBcomma%
+%     {\def\CWEBcomma{, }}%
+%   \def\docommand##1%
+%     {\bgroup
+%      \def\[####1]{####1}%
+%      \xdef\CWEBreference{##1}%
+%      \egroup
+%      \CWEBcomma{\naar{\donottest{##1}}[web:\CWEBreference]}}%
+%   \processcommalist[{#1}]\docommand
+%   \egroup}
+
+% \def\processCWEBsectionnumbers[#1]%
+%   {\bgroup
+%    \def\CWEBcomma%
+%      {\def\CWEBcomma{, }}%
+%    \def\docommand##1%
+%      {\bgroup
+%       \def\(####1){####1}%
+%       \xdef\CWEBreference{##1}%
+%       \egroup
+%       \CWEBcomma
+%       {\localcolortrue\naar{\donottest{##1}}[web:\CWEBreference]}}%
+%    \bgroup
+%    \def\[##1]{\(##1)}\let\(=\relax\xdef\CWEBreferences{#1}%
+%    \egroup
+%    \unexpanded\def\(##1){\[##1]}%
+%    \processcommacommand[\CWEBreferences]\docommand
+%    \egroup}
+
+\def\processCWEBsectionnumbers[#1]%
+  {\bgroup
+   \def\CWEBcomma%
+     {\def\CWEBcomma{, }}%
+   \def\docommand##1%
+     {\bgroup
+      \def\[####1]{####1}%
+      \xdef\CWEBreference{##1}%
+      \egroup
+      \CWEBcomma{\localcolortrue\goto{\donottest{##1}}[web:\CWEBreference]}}%
+   \processlist{(}{)}{,}\docommand(#1)
+   \egroup}
+
+\def\processCWEBsectionnotes%
+  {\catcode`\s=12
+   \doprocessCWEBsectionnotes}
+
+\def\doprocessCWEBsectionnotes#1.%
+  {\ifCWEBnotes
+     \def\next##1\ET##2##3.%
+       {\processCWEBsectionnumbers[##1]%
+        \if##2s%
+          {, and~\goto{##3}[web:##3]}%
+        \else
+          { and~\goto{##2##3}[web:##2##3]}%
+        \fi}%
+      \next#1.%
+   \else
+     \goto{#1}[web:#1]%
+   \fi
+   \afterCWEBnote % inside group!
+   \egroup}
+
+\let\afterCWEBnote=\relax
+
+\defCWEBmacro\note#1%
+  {\bgroup
+   \Y\noindent
+   \def\afterCWEBnote{\par}%
+   \hangindent2em
+   %\baselineskip10pt
+   \eightrm#1~\processCWEBsectionnotes}
+
+\def\oldCWEBmacroX#1:#2\X% original
+  {\ifmmode
+     \gdef\XX{\null$\null}%
+   \else
+     \gdef\XX{}%
+   \fi % section name
+   \XX$\langle\,${#2\eightrm\kern.5em#1}$\,\rangle$\XX}
+
+\defCWEBmacro\ATH%
+  {\oldCWEBmacroX\kern-.5em:Preprocessor definitions\X}
+
+\def\newCWEBmacroX#1:#2\X% original
+  {\ifmmode
+     \gdef\XX{\null$\null}%
+   \else
+     \gdef\XX{}%
+   \fi % section name
+   \XX$\langle\,$%
+   {#2\eightrm\kern.5em\processCWEBsectionnumbers[{#1}]}%
+   $\,\rangle$\XX}
+
+\defCWEBmacro\X#1:#2\X%
+  {\newCWEBmacroX#1:#2\X}
+
+\definemarking[CWEBfilename]
+\definemarking[CWEBsectiontitle]
+\definemarking[CWEBsectionnumber]
+\definemarking[CWEBsectiondepth]
+
+\defCWEBmacro\M#1%
+  {\MN{#1}%
+   \ifon
+     \vfil
+     \penalty-100
+     \vfilneg % beginning of section
+     \theCWEBvskip
+     \startsection
+     \pagereference[web:#1]%
+     \expanded{\marking[CWEBsectionnumber]{\secno}}%
+     \expanded{\marking[CWEBsectiondepth]{\the\gdepth}}%
+     \ignorespaces}
+
+\defCWEBmacro\N#1#2#3.%
+  {\gdepth=#1%
+   \MN{#2}% beginning of starred section
+   \ifon
+     \ifnum#1<\secpagedepth
+       \vfil
+       \eject % force page break if depth is small
+     \else
+       \vfil
+       \penalty-100
+       \vfilneg
+       \theCWEBvskip
+     \fi
+   \fi
+   \message{*\secno}% progress report
+   \makesectionformat % context
+   \defconvertedargument\ascii{#3}%
+   \edef\next%
+     {\write\CWEBcont % write to contents file
+        {\string\ZZ{\ascii}{#1}{\secno}%
+           {\sectionformat::\noexpand\userfolio}{\noexpand\realfolio}}}%
+   \next % \ZZ{title}{depth}{sec}{page}
+   \ifon
+     \startsection
+     \pagereference[web:#2]%
+     \marking[CWEBsectiontitle] {#3}%
+     \expanded{\marking[CWEBsectionnumber]{\secno}}%
+     \expanded{\marking[CWEBsectiondepth]{\the\gdepth}}%
+     {\bf#3.\quad}%
+     \ignorespaces}
+
+\defCWEBmacro\MN#1%
+  {\par % common code for \M, \N
+   {\xdef\secstar{#1}%
+    \let\*=\empty
+    \xdef\secno{#1}}% remove \* from section name
+   \ifx\secno\secstar
+     \onmaybe
+   \else
+     \ontrue
+   \fi}
+
+\newif\iflinktoCWEBfile
+
+\def\setCWEBlinkfile#1%
+  {\linktoCWEBfiletrue
+   \def\otherCWEBfile{#1}}
+
+\unprotect
+
+\def\gotoCWEBsection#1[#2]%
+  {\iflinktoCWEBfile
+     \bgroup
+       \setupinteraction[\c!color=,\c!style=]%
+       \let\savedreferenceprefix=\referenceprefix
+       \localcolortrue
+       \goto{#1}[\otherCWEBfile::\savedreferenceprefix web:#2]%
+     \egroup
+   \else
+     #1%
+   \fi}
+
+\protect
+
+\defCWEBmacro\startsection%
+  {\rightskip=0pt % get out of C mode (cf. \B)
+   \sfcode`;=1500
+   \pretolerance 200
+   \hyphenpenalty 50
+   \exhyphenpenalty 50
+   \noindent
+   \bgroup
+   \let\*=\lapstar
+   \gotoCWEBsection{\bf\secstar.\quad}[\secno]%
+   \egroup}
+
+\def\ignoreCWEBinput%
+  {\let\normalinput=\input
+   \def\input ##1 %
+     {\let\input=\normalinput}}
+
+\def\loadCWEBmacros#1%
+  {\let\oldN=\N
+   \def\N{\bgroup\setbox0=\vbox\bgroup\endinput}%
+   \ignoreCWEBinput
+   \ReadFile{#1.tex}%
+   \egroup\egroup
+   \let\N=\oldN}
+
+\def\resetCWEBcontext%
+  {\catcode`\|=12  % used in context discretionaries
+   \everypar{}     % used for context indentation and floats
+   \parskip=0pt    % no stretch between cweb paragraphs
+   \parindent=1em} % is related to cweb backspace etc
+
+\newwrite\CWEBcont
+
+\def\processCWEBsource #1 %
+  {\bgroup
+   \resetCWEBcontext
+   \activateCWEB
+   \ignoreCWEBinput
+   \immediate\openout\CWEBcont=#1.toc
+   \write\CWEBcont{\noexpand\unprotect}
+   \message{Source:}
+   \marking[CWEBfilename]{#1}
+   \ReadFile{#1.tex}\relax
+   \write\CWEBcont{\noexpand\protect}
+   \closeout\CWEBcont
+   \par
+   \egroup}
+
+\def\resetCWEBindexentry%
+  {\xdef\currentCWEBindexentry{}}
+
+\def\showCWEBindexentry#1% can be redefined
+  {\theCWEBvskip
+   \vskip3\lineheight
+   \goodbreak
+   \vskip-3\lineheight
+   {\pagereference[web:#1]\bf#1}%
+   \theCWEBvskip}
+
+\def\checkCWEBindexentry#1%
+  {\bgroup
+   \def\\##1{##1}%  a dummy that also removes the {}
+   \def\|##1{##1}%  another dummy
+   \def\.##1{*##1}% and another (the typewriter one)
+   \def\&##1{##1}%  and a last one
+   \def\9##1{##1}%  hold this one
+   \catcode`*=11
+   \expandafter\def\expandafter\entry\expandafter{#1}%
+   \defconvertedcommand\ascii\entry
+   \expanded{\FINDFIRSTCHARACTER{\ascii}}%
+   \doifnot{\currentCWEBindexentry}{\firstcharacter}
+     {\doifnot{\firstcharacter}{*} % signal for \firstbunch
+        {\global\let\currentCWEBindexentry=\firstcharacter
+         \showCWEBindexentry{\currentCWEBindexentry}}}%
+   \egroup}
+
+\def\theCWEBbeforeindex {\startcolumns}
+\def\theCWEBafterindex  {\stopcolumns}
+
+\def\processCWEBindex #1 %
+  {\bgroup
+   \resetCWEBcontext
+   \activateCWEB
+   \resetCWEBindexentry
+   \def\I##1, %
+     {\par
+      \checkCWEBindexentry{##1}%
+      \hangindent2em
+      \noindent##1:\kern1em%
+      \def\next####1.%
+        {\processCWEBsectionnumbers[{####1}]}%
+      \next}%
+   \def\[##1]%
+     {$\underline{##1}$}%
+   \let\*=\lapstar
+   \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
+%   \parskip 0pt plus .5pt
+   \rightskip0pt plus 2.5em
+   \tolerance 10000
+   \hyphenpenalty 10000
+   \parindent0pt
+   \message{Index:}
+   \marking[CWEBfilename]    {#1}
+   \marking[CWEBsectiontitle] {index}
+   \marking[CWEBsectionnumber]{}
+   \marking[CWEBsectiondepth]{}
+   \loadCWEBmacros{#1}
+   \theCWEBbeforeindex
+   \ReadFile{#1.idx}\relax
+   \theCWEBafterindex
+   \par
+   \egroup}
+
+\def\processCWEBsections #1 %
+  {\bgroup
+   \resetCWEBcontext
+   \activateCWEB
+   \loadCWEBmacros{#1}
+   \parfillskip = 0pt plus 1fil
+   \parindent   = 0pt
+   \let\topsecno=\nullsec
+   \def\note##1%
+     {\quad
+      \bgroup
+      \eightrm
+      ##1~\processCWEBsectionnotes}
+   \def\Q {\CWEBnotesfalse \note{Cited in section}}  % crossref for mention of a section
+   \def\Qs{\CWEBnotestrue  \note{Cited in sections}} % crossref for mentions of a section
+   \def\U {\CWEBnotesfalse \note{Used in section}}   % crossref for use of a section
+   \def\Us{\CWEBnotestrue  \note{Used in sections}}  % crossref for uses of a section
+   \def\I {\par\hangindent 2em}%
+   \let\*=*
+   \message{Section names:}
+   \marking[CWEBfilename]    {#1}
+   \marking[CWEBsectiontitle] {sections}
+   \marking[CWEBsectionnumber]{}
+   \marking[CWEBsectiondepth]{}
+   \loadCWEBmacros{#1}
+   \ReadFile{#1.scn}\relax
+   \par
+   \botofcontents
+   \par
+   \egroup}
+
+\def\processCWEBcontents #1 %
+  {\bgroup
+   \resetCWEBcontext
+   \activateCWEB
+   \loadCWEBmacros{#1}
+   \rightskip     = 0pt
+   \hyphenpenalty = 50
+   \tolerance     = 200
+   \parindent     = 0pt
+   \line{\hfil Section\hbox to3em{\hss Page}}
+   \let\ZZ=\contentsline
+   \message{Table of contents:}
+   \marking[CWEBfilename]    {#1}
+   \marking[CWEBsectiontitle] {table of contents}
+   \marking[CWEBsectionnumber]{}
+   \marking[CWEBsectiondepth]{}
+   \loadCWEBmacros{#1}
+   \ReadFile{#1.toc}\relax
+   \par
+   \egroup}
+
+\defCWEBmacro\contentsline#1#2#3#4#5%
+  {\ifnum#2=0
+     \smallbreak
+   \fi
+   \line{\consetup{#2}#1
+   \rm
+   \leaders\hbox to .5em{.\hfil}\hfil\
+   {\localcolortrue\goto{#3}[web:#3]}%  below: \gotorealpage ? should be changed
+   \hbox to3em{\localcolortrue\hss\gotorealpage{}{}{#5}{\translatednumber[#4]\presetgoto}}}}
+
+%D A last hack, needed because a file can overload of the
+%D above. (Some day: a check like \type{\ifx#1\CWEBdefined}.)
+
+\def\outer#1#2%
+  {\ifx#2\undefined
+     \expandafter#1\expandafter#2%
+   \else
+     \expandafter#1\expandafter\ThrowAway
+   \fi}
+
+\endinput
diff --git a/tex/context/base/m-database.lua b/tex/context/modules/mkiv/m-database.lua
index 91e9636ee..91e9636ee 100644
--- a/tex/context/base/m-database.lua
+++ b/tex/context/modules/mkiv/m-database.lua
diff --git a/tex/context/base/m-database.mkiv b/tex/context/modules/mkiv/m-database.mkiv
index cc7dd3d72..cc7dd3d72 100644
--- a/tex/context/base/m-database.mkiv
+++ b/tex/context/modules/mkiv/m-database.mkiv
diff --git a/tex/context/base/m-directives.mkiv b/tex/context/modules/mkiv/m-directives.mkiv
index 8b551b27a..8b551b27a 100644
--- a/tex/context/base/m-directives.mkiv
+++ b/tex/context/modules/mkiv/m-directives.mkiv
diff --git a/tex/context/modules/mkiv/m-educat.mkiv b/tex/context/modules/mkiv/m-educat.mkiv
new file mode 100644
index 000000000..93b1a6c5d
--- /dev/null
+++ b/tex/context/modules/mkiv/m-educat.mkiv
@@ -0,0 +1,217 @@
+%D \module
+%D   [       file=m-educat,
+%D        version=2003.03.05,
+%D          title=\CONTEXT\ Extra Modules,
+%D       subtitle=Educational Extras,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This module will collect a few macros cq.\ definitions
+%D meant for educational use. Most of the code has been laying
+%D around for some time and has been (or is still) used in
+%D \PRAGMA\ projects.
+
+\unprotect
+
+\definesystemvariable{iv}
+
+\definecolor [answerareacolor] [s=.90]
+\definecolor [answerlinecolor] [white]
+
+\definetextbackground
+  [\v!answerarea]
+  [\c!location=\v!text,
+   \c!n=0,
+   \c!frame=\v!off,
+   \c!framecolor=answerlinecolor,
+   \c!rulethickness=2pt,
+   \c!background=\v!color,
+   \c!backgroundcolor=answerareacolor,
+   \c!alternative=2] % betweenline
+
+% n=gedwongen
+% m=extra auto
+
+\def\setupanswerarea
+  {\setuptextbackground[\v!answerarea]}
+
+\setvalue\e!answerspace
+  {\dosingleempty\doanswerspace}
+
+\def\doanswerspace[#1]%
+  {\begingroup
+   \dontcomplain
+   \setupanswerarea
+     [\c!n=0,\c!m=,#1,\c!location=\v!text]%
+   \doifelsenothing{\textbackgroundparameter\c!m}
+     {\expandafter\donoanswerspace}
+     {\expandafter\dodoanswerspace}%
+   [#1]}
+
+\def\donoanswerspace[#1]#2%
+  {\setupthinrules
+     [\c!alternative=\textbackgroundparameter\c!alternative,
+      \c!color=\textbackgroundparameter\c!framecolor,
+      \c!background=\textbackgroundparameter\c!background,
+      \c!backgroundcolor=\textbackgroundparameter\c!backgroundcolor,
+      \c!rulethickness=\textbackgroundparameter\c!rulethickness]%
+   \doifelse{\textbackgroundparameter\c!n}{*}
+     {\thinrule
+      \par}
+     {\scratchcounter0\textbackgroundparameter\c!n\relax
+      % tricky, guess
+      \def\processisolatedword##1%
+        {\setbox\scratchbox=\hbox{##1}%
+         \vbox{\hsize\wd\scratchbox\thinrule
+         \ifcase\scratchcounter\else
+           \setbox\scratchbox=\hbox{\space}%
+           \nobreak\hskip\zeropoint \!!minus \wd\scratchbox
+           \vbox{\hsize\wd\scratchbox\thinrule}%
+         \fi}}%
+      \processisolatedwords{#2}\processisolatedword
+      % so far
+      \ifcase\scratchcounter \else \ifnum\scratchcounter<3
+        \nobreak \vbox{\hsize\scratchcounter em\thinrule}%
+      \else % more
+        \advance \scratchcounter -2
+        \dorecurse\scratchcounter{\allowbreak\vbox{\hsize1em\thinrule}}%
+        \nobreak \vbox{\hsize2em\thinrule}%
+      \fi \fi}%
+   \endgroup}
+
+\def\dodoanswerspace[#1]#2% m case
+  {\getvalue{\e!start\v!answerarea}%
+   #2%
+   \doifelse{\textbackgroundparameter\c!m}{*}
+     {\hfill\strut
+      \getvalue{\e!stop\v!answerarea}%
+      \par}
+     {\scratchcounter0\textbackgroundparameter\c!m\relax
+      \ifcase\scratchcounter \else \ifnum\scratchcounter<3
+        \nobreak \hbox to \scratchcounter em{\strut\hss}%
+      \else % more
+        \advance \scratchcounter -2
+        \dorecurse\scratchcounter{\allowbreak\hbox to 1em{\strut\hss}}%
+        \nobreak \hbox to 2em{\strut\hss}%
+      \fi \fi
+      \getvalue{\e!stop\v!answerarea}}%
+   \endgroup}
+
+\setvalue{\e!start\e!answerlines}%
+  {\dosingleempty\dostartanswerlines}
+
+\def\dostartanswerlines[#1]%
+  {\begingroup
+   \dontcomplain
+   \setupanswerarea
+     [\c!n=0,\c!m=,#1,\c!location=\v!text]%
+   \doifnot{\textbackgroundparameter\c!option}\v!joinedup\softbreak
+   \doifelsenothing{\textbackgroundparameter\c!m}
+     {\expandafter\donostartanswerlines}
+     {\expandafter\dodostartanswerlines}%
+   [#1]}
+
+\def\donostartanswerlines[#1]%
+  {\setupthinrules
+     [\c!alternative=\textbackgroundparameter\c!alternative,
+      \c!color=\textbackgroundparameter\c!framecolor,
+      \c!background=\textbackgroundparameter\c!background,
+      \c!backgroundcolor=\textbackgroundparameter\c!backgroundcolor,
+      \c!rulethickness=\textbackgroundparameter\c!rulethickness]%
+   \thinrules[\c!n=\textbackgroundparameter\c!n]\par
+   \endgroup
+   \grabuntil{\e!stop\e!answerlines}}
+
+\def\dodostartanswerlines[#1]%
+  {\begingroup
+   \getvalue{\e!start\v!answerarea}%
+   \ignorespaces}
+
+\setvalue{\e!stop\e!answerlines}%
+  {\scratchcounter0\textbackgroundparameter\c!m\relax
+   % a \softbreak is more efficient in pos dan \par
+   \ifcase\scratchcounter
+     % nothing
+   \or
+     \softbreak
+   \else
+     \softbreak
+     \advance \scratchcounter \minusone
+     \dorecurse\scratchcounter{\strut\hfill\strut\softbreak}%
+   \fi
+   \strut\hfill\strut
+   \getvalue{\e!stop\v!answerarea}%
+   \par\endgroup\endgroup}
+
+\setvalue\e!answerlines
+  {\dosingleempty\doanswerlines}
+
+\def\doanswerlines[#1]#2%
+  {\getvalue{\e!start\e!answerlines}[#1]%
+   #2%
+   \getvalue{\e!stop\e!answerlines}}
+
+\protect \doifnotmode{demo}{\endinput}
+
+%D Test materiaal.
+
+\starttext
+
+\startnotmode[answers]
+
+  \setupanswerarea[level=+1]
+
+\stopnotmode
+
+\setupcolors[state=start]
+
+test test test \answerspace [n=10] {Whow}. test test test
+test tets test test \answerspace [n=10] {Whow}. test test
+test test tets test test \answerspace [n=10] {Whow}. test
+test test test tets test test \answerspace [n=10] {Whow}.
+test test test test test test \answerspace [n=*] {Whow.}
+
+test test test test test test test \startanswerlines
+[n=3] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[n=3,alternative=0] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[n=3,alternative=1] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[n=3,alternative=2] What A Junk Answer \stopanswerlines
+
+\startitemize[paragraph]
+\item \startanswerlines [option=seried,n=2] xxx \stopanswerlines
+\stopitemize
+
+test test test \answerspace [m=10] {Whow}. test test test
+test tets test test \answerspace [m=10] {Whow}. test test
+test test tets test test \answerspace [m=10] {Whow}. test
+test test test tets test test \answerspace [m=10] {Whow}.
+test test test test test test \answerspace [m=*] {Whow.}
+
+test test test test test test test \startanswerlines
+[m=2] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[m=2,alternative=0] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[m=2,alternative=1] What A Junk Answer \stopanswerlines
+
+test test test test test test test \startanswerlines
+[m=2,alternative=2] What A Junk Answer \stopanswerlines
+
+\startitemize[paragraph]
+\item \startanswerlines [option=seried,m=2] xxx \stopanswerlines
+\stopitemize
+
+\stoptext
diff --git a/tex/context/base/m-escrito.lua b/tex/context/modules/mkiv/m-escrito.lua
index 0d7a04741..0d7a04741 100644
--- a/tex/context/base/m-escrito.lua
+++ b/tex/context/modules/mkiv/m-escrito.lua
diff --git a/tex/context/base/m-escrito.mkiv b/tex/context/modules/mkiv/m-escrito.mkiv
index 763857918..763857918 100644
--- a/tex/context/base/m-escrito.mkiv
+++ b/tex/context/modules/mkiv/m-escrito.mkiv
diff --git a/tex/context/base/m-fields.mkiv b/tex/context/modules/mkiv/m-fields.mkiv
index 46b77f8d3..46b77f8d3 100644
--- a/tex/context/base/m-fields.mkiv
+++ b/tex/context/modules/mkiv/m-fields.mkiv
diff --git a/tex/context/modules/mkiv/m-format.mkiv b/tex/context/modules/mkiv/m-format.mkiv
new file mode 100644
index 000000000..7cedd803f
--- /dev/null
+++ b/tex/context/modules/mkiv/m-format.mkiv
@@ -0,0 +1,411 @@
+%D \module
+%D   [       file=m-formay,
+%D        version=ancient,
+%D          title=\CONTEXT\ Modules,
+%D       subtitle=Ancient Formatting Code,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Here is some code that I had laying around and had forgotten
+%D about. Let's make it a module and see if there is interest in
+%D such things.
+
+% \defineformatblock   [poem]
+% \defineformatsegment [verse] % [poem]
+% \defineformatline    [line]  % [verse]
+%
+% \startpoem  [title] [author]
+% \startverse [ref]
+% \startline  [ref]
+%
+% block   : voor na tussen *tekstletter *tekstkleur
+%
+% segment : voor na tussen *tekstletter *tekstkleur
+%         : links rechts linkeroffset rechteroffset
+%         : ?marge *evenmarge *onevenmarge breedte
+%         : nummer *nummercommando *conversie
+%         : nummerletter nummerkleur *label
+%
+% line    : voor na tussen *tekstletter *tekstkleur
+%         : nummer *nummercommando *conversie
+%         : nummerletter nummerkleur *label
+%
+% * = todo
+
+\unprotect
+
+\definesystemvariable {fx}   % format block
+\definesystemvariable {fy}   % format segment
+\definesystemvariable {fz}   % format line
+
+\def\defineformatblock
+  {\dodoubleempty\dodefineformatblock}
+
+\def\dodefineformatblock[#1][#2]%
+  {\setupformatblock
+     [#1]
+     [\c!before=\blank,\c!after=\blank,\c!inbetween=\blank,
+      \c!textstyle=,\c!textcolor=,#2]%
+   \setvalue{\e!start#1}{\startformatblock[#1]}%
+   \setvalue{\e!stop #1}{\stopformatblock}}
+
+\def\setupformatblock
+  {\dodoubleempty\dosetupformatblock}
+
+\def\setupformatblock[#1]%
+  {\getparameters[\??fx#1]}
+
+\def\startformatblock[#1]%
+  {\dotriplegroupempty\dostartformatblock{#1}}
+
+\def\dostartformatblock#1#2#3
+  {\bgroup
+   \getvalue{\??fx#1\c!before}
+   \doglobal\newcounter\formatsegmentcounter
+   \doglobal\newcounter\formatlinecounter
+   \doglobal\newcounter\formatlinesubcounter
+   \doglobal\newcounter\formatlinemaxcounter
+   \doifsomething{#2}{\leftaligned{#2}\getvalue{\??fx#1\c!inbetween}}
+   \def\stopformatblock%
+     {\doifsomething{#3}{\getvalue{\??fx#1\c!inbetween}\leftaligned{#3}}
+      \getvalue{\??fx#1\c!after}
+      \egroup}}
+
+\def\defineformatsegment
+  {\dodoubleempty\dodefineformatsegment}
+
+\def\dodefineformatsegment[#1][#2]%
+  {\setupformatsegment
+     [#1]
+     [\c!before=\blank,\c!after=\blank,\c!inbetween=\blank,
+      \c!textstyle=,\c!textcolor=,\c!left=,\c!right=,
+      \c!leftoffset=\!!zeropoint,\c!rightoffset=\!!zeropoint,
+     %\c!margin=\!!zeropoint,\c!evenmargin=\!!zeropoint,\c!oddmargin=\hsize,
+      \c!width=\hsize,\c!numberstyle=,\c!numbercolor=,\c!number=\v!no,
+      \c!numbercommand=,\c!conversion=,\c!label=,
+      #2]%
+   \setvalue{\e!start#1}{\startformatsegment[#1]}%
+   \setvalue{\e!stop #1}{\stopformatsegment}}
+
+\def\setupformatsegment
+  {\dodoubleempty\dosetupformatsegment}
+
+\def\setupformatsegment[#1]%
+  {\getparameters[\??fy#1]}
+
+\def\placeformatsegmentcounter
+  {\formatsegmentcounter\quad\hphantom{\placeformatlinecounter}}
+
+\def\placeformatlinecounter
+  {\formatlinecounter}
+
+\def\startformatsegment[#1]%
+  {\bgroup
+   \doifelsevalue{\??fy#1\c!number}\v!yes
+     {\def\doplaceformatsegmentcounter
+        {\inleftmargin
+           {\doattributes{\??fy#1}\c!numberstyle\c!numbercolor
+              {\placeformatsegmentcounter}}}}
+     {\let\doplaceformatsegmentcounter\relax}%
+   \getvalue{\??fy#1\c!before}
+   \doglobal\increment\formatsegmentcounter
+   \def\formatrightoffset{\getvalue{\??fy#1\c!rightoffset}}
+   \def\formatleftoffset {\getvalue{\??fy#1\c!leftoffset}}
+   \def\formatminwidth   {\getvalue{\??fy#1\c!minwidth}}
+   \def\formatwidth      {\getvalue{\??fy#1\c!width}}
+  %\def\formatmargin     {\getvalue{\??fy#1\c!margin}}
+   \def\formatbefore     {\getvalue{\??fy#1\c!before}}
+   \def\formatinbetween  {\getvalue{\??fy#1\c!inbetween}}
+   \def\formatafter      {\getvalue{\??fy#1\c!after}}
+   \def\formatleft       {\getvalue{\??fy#1\c!left}}
+   \def\formatright      {\getvalue{\??fy#1\c!right}}
+   \@@segmentvarianta
+   \getvalue{@@segmentvariant\getvalue{\??fy#1\c!alternative}}
+   \def\stopformatsegment
+     {\getvalue{\??fy#1\c!after}
+      \egroup}}
+
+\newif\iftraceformatblock
+
+\def\@@segmentvarianta % ragged right, symbols
+  {\let\formatraggedness\raggedright
+   \let\dostartformatline\dostartformatlineab
+   \let\formatleftfirst\relax \let\formatrightfirst\hfill
+   \let\formatleftnext \hfill \let\formatrightnext \relax}
+
+\def\@@segmentvariantb % ragged right, equal parts, symbols
+  {\let\formatraggedness\raggedcenter
+   \let\dostartformatline\dostartformatlineab
+   \let\formatleftfirst\relax \let\formatrightfirst\hfill
+   \let\formatleftnext \hfill \let\formatrightnext \relax}
+
+\def\@@segmentvariantc % ragged right
+  {\let\formatraggedness\veryraggedright
+   \let\dostartformatline\dostartformatlinecde
+   \let\formatleftnext\relax \let\formatrightnext\hfill}
+
+\def\@@segmentvariantd % ragged center
+  {\let\formatraggedness\veryraggedcenter
+   \let\dostartformatline\dostartformatlinecde
+   \let\formatleftnext\hfill \let\formatrightnext\hfill}
+
+\def\@@segmentvariante % ragged left
+  {\let\formatraggedness\veryraggedleft
+   \let\dostartformatline\dostartformatlinecde
+   \let\formatleftnext\hfill \let\formatrightnext\relax}
+
+\def\defineformatline
+  {\dodoubleempty\dodefineformatline}
+
+\def\dodefineformatline[#1][#2]%
+  {\setupformatline
+     [#1]
+     [\c!before=\blank,\c!after=\blank,\c!inbetween=\blank,
+      \c!textstyle=,\c!textcolor=,
+      \c!number=\v!no,\c!numbercommand=,\c!conversion=,
+      \c!numberstyle=,\c!numbercolor=,\c!label=,
+      #2]%
+   \setvalue{\e!start#1}{\startformatline[#1]}%
+   \setvalue{\e!stop #1}{\stopformatline}}
+
+\def\setupformatline
+  {\dodoubleempty\dosetupformatline}
+
+\def\setupformatline[#1]%
+  {\getparameters[\??fz#1]}
+
+\newconditional\formatforcedbreak
+
+\def\startformatline[#1]%
+  {\bgroup
+   \doifelsevalue{\??fz#1\c!number}\v!yes
+    {\def\doplaceformatlinecounter
+       {\inleftmargin
+          {\doattributes{\??fz#1}\c!numberstyle\c!numbercolor
+             {\placeformatlinecounter}}}}
+     {\let\doplaceformatlinecounter\relax}%
+   \global\setfalse\formatforcedbreak
+   \def\\{\break\global\settrue\formatforcedbreak}%
+   \hsize\formatwidth
+   \doglobal\increment\formatlinecounter
+   \par
+   \nobreak
+   \def\stopformatline
+     {\unskip\unskip\unskip\unskip\unskip\egroup
+      \let\doplaceformatsegmentcounter\relax}
+   \postponenotes
+   \dowithnextbox{\dostartformatline}\hbox\bgroup\ignorespaces}
+
+\def\dostartformatlineab
+  {%\dosetleftskipadaption\formatmargin
+   %\advance\hsize-\leftskipadaption\relax
+   \ifdim\nextboxwd>\hsize
+     \beginofshapebox
+       \forgetall
+       \hangafter\plusone
+       \hangindent\formatleftoffset
+       \formatraggedness
+       \hskip\formatrightoffset
+       \unhbox\nextbox\par
+     \endofshapebox
+    %\advance\hsize \leftskipadaption
+     \doglobal\newcounter\formatlinesubcounter
+     \reshapebox
+       {\doglobal\increment\formatlinesubcounter}
+     \global\let\formatlinemaxcounter\formatlinesubcounter
+     \reshapebox
+       {\doglobal\decrement\formatlinesubcounter
+        \ifnum\formatlinesubcounter=\zerocount
+          \doplaceformatsegmentcounter
+          \doplaceformatlinecounter
+          \hskip-\formatrightoffset
+         %\hskip\leftskipadaption
+          \formatleftfirst
+          \unhbox\shapebox
+          \ifnum\formatlinemaxcounter>\plusone
+            \ifx\formatright\empty\else
+              \shapedhbox to \zeropoint{\formatright\hss}%
+            \fi
+          \fi
+          \formatrightfirst
+          \iftraceformatblock
+            \ruledhskip\formatrightoffset\hskip-\formatrightoffset
+          \fi
+        \else
+         %\hskip\leftskipadaption
+          \iftraceformatblock
+            \ruledhskip\formatleftoffset\hskip-\formatleftoffset
+          \fi
+          \formatleftnext
+          \ifx\formatleft\empty\else
+            \shapedhbox to \zeropoint{\hss\formatleft}%
+          \fi
+          \unhbox\shapebox
+          \formatrightnext
+        \fi}
+     \flushshapebox
+   \else
+     \dontleavehmode\hbox
+       {\doplaceformatsegmentcounter
+        \doplaceformatlinecounter
+       %\hskip\leftskipadaption
+        \formatleftfirst
+        \unhbox\nextbox
+        \formatrightfirst}
+   \fi
+   \par
+   \egroup}
+
+\def\dostartformatlinecde
+  {%\dosetleftskipadaption\formatmargin
+   %\advance\hsize -\leftskipadaption\relax
+   \dimen0=\hsize
+   \ifconditional\formatforcedbreak\else
+     \ifdim\formatminwidth>\zeropoint\relax
+       \ifdim\nextboxwd>\hsize
+         \doloop
+           {\global\dimen1=\dimen0
+            \beginofshapebox
+              \hsize\dimen0
+              \forgetall
+              \formatraggedness
+              \unhcopy\nextbox\par
+            \endofshapebox
+            \reshapebox
+              {\setbox\scratchbox=\hbox{\unhbox\shapebox}%
+               \ifdim\wd\scratchbox<\dimen1
+                 \global\dimen1=\wd\scratchbox
+               \fi}
+            \ifdim\dimen1<\formatminwidth\relax
+              \advance\dimen0 by -.25em
+            \else
+              \exitloop
+            \fi
+            \ifdim\dimen0<10em
+              \dimen0=\hsize
+              \exitloop
+            \fi}
+       \fi
+     \fi
+   \fi
+   \beginofshapebox
+     \hsize\dimen0
+     \forgetall
+     \formatraggedness
+     \unhcopy\nextbox\par
+   \endofshapebox
+  %\advance\hsize \leftskipadaption
+   \doglobal\newcounter\formatlinesubcounter
+   \reshapebox
+     {\doglobal\increment\formatlinesubcounter}%
+   \global\let\formatlinemaxcounter\formatlinesubcounter
+   \reshapebox
+     {\doglobal\decrement\formatlinesubcounter
+      \ifnum\formatlinesubcounter=\zerocount
+        \doplaceformatsegmentcounter
+        \doplaceformatlinecounter
+      \fi
+     %\hskip\leftskipadaption
+      \formatleftnext
+      \unhbox\shapebox
+      \formatrightnext\strut}% strut prevents unskip
+   \flushshapebox
+   \par
+   \egroup}
+
+\defineformatblock[poem]
+  [\c!before=\blank,
+   \c!inbetween={\blank[\v!medium]},
+   \c!after=\blank]
+
+\defineformatsegment[verse]
+  [\c!alternative=\v!left,
+   \c!width=\hsize,
+  %\c!margin=\!!zeropoint,
+   \c!before={\blank[\v!medium]},
+   \c!after={\blank[\v!medium]},
+   \c!inbetween={\blank[\v!medium]},
+   \c!leftoffset=3em,
+   \c!rightoffset=2em,
+   \c!minwidth=5em,
+   \c!left={$[$\enspace},
+   \c!right={\enspace$]$}]
+
+\defineformatline[line]
+  []
+
+\protect
+
+\doifnotmode{demo} {\endinput}
+
+% evt defineblank[formatbefore,formatinbetween,formatafter]
+
+%\showframe \traceformatblocktrue
+
+\usemodule[visual]
+
+\setuplayout[height=middle,topspace=1cm,header=0pt,footer=0pt]
+\setupbodyfont[10pt]
+
+% All interfaces supported, but testing with english; todo:
+% more options, more alternatives, inheritance and mixed
+% definitions, and so.
+
+\starttext
+
+\startbuffer
+\startbuffer[poem]
+\startpoem{A Random Poem}{Hans Hagen}
+  \startverse
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+  \stopverse
+  \startverse
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+    \startline \fakewords{4}{8} \stopline
+  \stopverse
+\stoppoem
+\stopbuffer
+
+\setupformatsegment[verse][width=.4\hsize,number=yes,numberstyle=slanted]
+\setupformatline   [line] [number=yes,numberstyle=smallslanted]
+
+\startbuffer[x]
+\setupformatsegment[verse][leftoffset=0pt,rightoffset=0pt,left=,right=]
+\stopbuffer
+
+\section{Alternative A}
+
+\setupformatsegment[verse][alternative=a] {\getbuffer[poem]}
+\setupformatsegment[verse][alternative=a] {\getbuffer[x,poem]}
+
+\section{Alternative B}
+
+\setupformatsegment[verse][alternative=b] {\getbuffer[poem]}
+\setupformatsegment[verse][alternative=b] {\getbuffer[x,poem]}
+
+\section{Alternative C}
+
+\setupformatsegment[verse][alternative=c] {\getbuffer[poem]}
+
+\section{Alternative D}
+
+\setupformatsegment[verse][alternative=d] {\getbuffer[poem]}
+
+\section{Alternative E}
+
+\setupformatsegment[verse][alternative=e] {\getbuffer[poem]}
+\stopbuffer
+
+\typebuffer \getbuffer
+
+\stoptext
diff --git a/tex/context/base/m-graph.mkiv b/tex/context/modules/mkiv/m-graph.mkiv
index 62c4ec4cb..62c4ec4cb 100644
--- a/tex/context/base/m-graph.mkiv
+++ b/tex/context/modules/mkiv/m-graph.mkiv
diff --git a/tex/context/base/m-hemistich.mkiv b/tex/context/modules/mkiv/m-hemistich.mkiv
index 7a849d415..7a849d415 100644
--- a/tex/context/base/m-hemistich.mkiv
+++ b/tex/context/modules/mkiv/m-hemistich.mkiv
diff --git a/tex/context/base/m-ipsum.mkiv b/tex/context/modules/mkiv/m-ipsum.mkiv
index 1c5901d86..1c5901d86 100644
--- a/tex/context/base/m-ipsum.mkiv
+++ b/tex/context/modules/mkiv/m-ipsum.mkiv
diff --git a/tex/context/base/m-json.mkiv b/tex/context/modules/mkiv/m-json.mkiv
index 329aa0f31..329aa0f31 100644
--- a/tex/context/base/m-json.mkiv
+++ b/tex/context/modules/mkiv/m-json.mkiv
diff --git a/tex/context/modules/mkiv/m-layout.mkiv b/tex/context/modules/mkiv/m-layout.mkiv
new file mode 100644
index 000000000..5ccf0e987
--- /dev/null
+++ b/tex/context/modules/mkiv/m-layout.mkiv
@@ -0,0 +1,102 @@
+%D \module
+%D   [       file=m-layout,
+%D        version=2004.01.16,
+%D          title=\CONTEXT\ Modules,
+%D       subtitle=Additional Layouts,
+%D         author={Hans Hagen \& Ton Otten},
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% layout-preset - thf th tf
+
+%D This is a preliminary module, don't depend on these dimensions yet.
+
+\readsysfile{lang-frq}\donothing\donothing
+\readsysfile{lang-frd}\donothing\donothing
+
+\unprotect
+
+% \def\layouthwratio{\withoutpt\the\dimexpr8\paperheight/\dimexpr(\paperwidth/ 8192)\relax}
+% \def\layouthwratio{\withoutpt\the\dimexpr4\paperheight/\dimexpr(\paperwidth/16384)\relax}
+% \def\layouthwratio{\withoutpt\the\dimexpr2\paperheight/\dimexpr(\paperwidth/32768)\relax}
+
+\def\layouthwratio
+  {\withoutpt\the\dimexpr2\paperheight/(\paperwidth/32768)\relax}
+
+\def\layouthfheight
+  {\dimexpr\layoutparameter\c!header+\layoutparameter\c!headerdistance+
+           \layoutparameter\c!footer+\layoutparameter\c!footerdistance\relax}
+
+\startsetups[preset-1]
+
+  \xdef\layoutwidth {\dimexpr\layoutparameter\c!width\relax}
+  \gdef\layoutheight{\dimexpr\layouthwratio\dimexpr\layoutwidth\relax+\layouthfheight\relax}
+
+\stopsetups
+
+\definelayout
+  [preset-1-1]
+  [\c!preset=preset-1,
+   \c!backspace=\dimexpr(\paperwidth-\layoutwidth)/2\relax,
+   \c!width=\dimexpr2\paperwidth/3\relax,
+   \c!cutspace=\dimexpr(\paperwidth-\layoutwidth)/2\relax,
+   \c!margin=\dimexpr(\paperwidth-\layoutwidth)/3\relax,
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance, % \lineheight,
+   \c!footer=\layoutparameter\c!header, % 2\lineheight,
+   \c!topspace=\dimexpr1\dimexpr\paperheight-(\layoutheight+\layouthfheight)\relax/3\relax,
+   \c!bottomspace=\dimexpr2\dimexpr\paperheight-(\layoutheight+\layouthfheight)\relax/3\relax]
+
+\startsetups[preset-2]
+
+  \gdef\layouthstep{\dimexpr\paperwidth /\layoutparameter\c!columns\relax}
+  \gdef\layoutvstep{\dimexpr\paperheight/\layoutparameter\c!columns\relax}
+
+\stopsetups
+
+\definelayout
+  [preset-2-1]
+  [\c!preset=preset-2,
+   \c!columns=12,
+   \c!backspace=\layouthstep,
+   \c!width=\v!middle,
+   \c!cutspace=2\layouthstep,
+   \c!margin=\layouthstep,
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance,
+   \c!footer=\layoutparameter\c!header,
+   \c!topspace=\dimexpr\layoutvstep-\layoutparameter\c!header-\layoutparameter\c!headerdistance\relax,
+   \c!bottomspace=\dimexpr(2\layoutvstep)-\layoutparameter\c!header-\layoutparameter\c!headerdistance\relax]
+
+\definelayout
+  [preset-2-2]
+  [\c!preset=preset-2,
+   \c!columns=12,
+   \c!backspace=\layouthstep,
+   \c!width=\v!middle,
+   \c!cutspace=2\layouthstep,
+   \c!margin=\layouthstep,
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance,
+   \c!footer=\layoutparameter\c!header,
+   \c!topspace=\layoutvstep,
+   \c!bottomspace=\layoutvstep] % maybe 1.5
+
+%                                                     \setuplayout[preset-1-1] test \showframe \page
+% \setuplayout[preset-1-1][width=65\averagecharwidth] \setuplayout[preset-1-1] test \showframe \page
+%                                                     \setuplayout[preset-2-1] test \showframe \page
+% \setuplayout[preset-2-1][columns=10]                \setuplayout[preset-2-1] test \showframe \page
+%                                                     \setuplayout[preset-2-2] test \showframe \page
+% \setuplayout[preset-2-2][columns=10]                \setuplayout[preset-2-2] test \showframe \page
+
+\protect \endinput
diff --git a/tex/context/base/m-logcategories.mkiv b/tex/context/modules/mkiv/m-logcategories.mkiv
index 954cd58c4..954cd58c4 100644
--- a/tex/context/base/m-logcategories.mkiv
+++ b/tex/context/modules/mkiv/m-logcategories.mkiv
diff --git a/tex/context/base/m-markdown.lua b/tex/context/modules/mkiv/m-markdown.lua
index 1f9402f60..1f9402f60 100644
--- a/tex/context/base/m-markdown.lua
+++ b/tex/context/modules/mkiv/m-markdown.lua
diff --git a/tex/context/base/m-markdown.mkiv b/tex/context/modules/mkiv/m-markdown.mkiv
index 6e0036513..6e0036513 100644
--- a/tex/context/base/m-markdown.mkiv
+++ b/tex/context/modules/mkiv/m-markdown.mkiv
diff --git a/tex/context/base/m-mathcrap.mkiv b/tex/context/modules/mkiv/m-mathcrap.mkiv
index 25efd2d5d..25efd2d5d 100644
--- a/tex/context/base/m-mathcrap.mkiv
+++ b/tex/context/modules/mkiv/m-mathcrap.mkiv
diff --git a/tex/context/base/m-matrix.mkiv b/tex/context/modules/mkiv/m-matrix.mkiv
index ccb376e39..ccb376e39 100644
--- a/tex/context/base/m-matrix.mkiv
+++ b/tex/context/modules/mkiv/m-matrix.mkiv
diff --git a/tex/context/base/m-mkii.mkiv b/tex/context/modules/mkiv/m-mkii.mkiv
index dcfd29d20..dcfd29d20 100644
--- a/tex/context/base/m-mkii.mkiv
+++ b/tex/context/modules/mkiv/m-mkii.mkiv
diff --git a/tex/context/base/m-mkivhacks.mkiv b/tex/context/modules/mkiv/m-mkivhacks.mkiv
index 3ed002e1d..3ed002e1d 100644
--- a/tex/context/base/m-mkivhacks.mkiv
+++ b/tex/context/modules/mkiv/m-mkivhacks.mkiv
diff --git a/tex/context/base/m-morse.mkvi b/tex/context/modules/mkiv/m-morse.mkvi
index a2c20dff7..a2c20dff7 100644
--- a/tex/context/base/m-morse.mkvi
+++ b/tex/context/modules/mkiv/m-morse.mkvi
diff --git a/tex/context/modules/mkiv/m-narrowtt.mkiv b/tex/context/modules/mkiv/m-narrowtt.mkiv
new file mode 100644
index 000000000..7d497a02f
--- /dev/null
+++ b/tex/context/modules/mkiv/m-narrowtt.mkiv
@@ -0,0 +1,39 @@
+%D \module
+%D   [       file=m-narrowtt,
+%D        version=2005.09.08,
+%D          title=\CONTEXT\ Modules,
+%D       subtitle=Narrow Verbatim,
+%D         author={Hans Hagen \& Ton Otten},
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Test file
+%D
+%D \starttyping
+%D \startTEX
+%D \usemodule[narrowtt]
+%D \starttext
+%D \starttyping
+%D Test test test.
+%D \stoptyping
+%D test \type {test} test \type{test} test
+%D \starttyping
+%D Test test test.
+%D \stoptyping
+%D \stoptext
+%D \stopTEX
+
+\unprotect
+
+\definetypeface
+  [narrowtt] [tt]
+  [mono] [modern-condensed] [\s!default] [\s!features=\s!none]
+
+\definetyping[n\v!typing] \setuptyping[n\v!typing][style=\narrowtt]
+\definetype  [n\v!type]   \setuptype  [n\v!type]  [style=\narrowtt]
+
+\protect \endinput
diff --git a/tex/context/base/m-nodechart.lua b/tex/context/modules/mkiv/m-nodechart.lua
index 4f2740ef4..4f2740ef4 100644
--- a/tex/context/base/m-nodechart.lua
+++ b/tex/context/modules/mkiv/m-nodechart.lua
diff --git a/tex/context/base/m-nodechart.mkvi b/tex/context/modules/mkiv/m-nodechart.mkvi
index c9d985850..c9d985850 100644
--- a/tex/context/base/m-nodechart.mkvi
+++ b/tex/context/modules/mkiv/m-nodechart.mkvi
diff --git a/tex/context/base/m-ntb-to-xtb.mkiv b/tex/context/modules/mkiv/m-ntb-to-xtb.mkiv
index 55b4ab259..55b4ab259 100644
--- a/tex/context/base/m-ntb-to-xtb.mkiv
+++ b/tex/context/modules/mkiv/m-ntb-to-xtb.mkiv
diff --git a/tex/context/base/m-obsolete.mkiv b/tex/context/modules/mkiv/m-obsolete.mkiv
index 2d4518181..2d4518181 100644
--- a/tex/context/base/m-obsolete.mkiv
+++ b/tex/context/modules/mkiv/m-obsolete.mkiv
diff --git a/tex/context/base/m-oldfun.mkiv b/tex/context/modules/mkiv/m-oldfun.mkiv
index 3f2ec0263..3f2ec0263 100644
--- a/tex/context/base/m-oldfun.mkiv
+++ b/tex/context/modules/mkiv/m-oldfun.mkiv
diff --git a/tex/context/base/m-oldnum.mkiv b/tex/context/modules/mkiv/m-oldnum.mkiv
index 382c56eb6..382c56eb6 100644
--- a/tex/context/base/m-oldnum.mkiv
+++ b/tex/context/modules/mkiv/m-oldnum.mkiv
diff --git a/tex/context/modules/mkiv/m-pictex.mkiv b/tex/context/modules/mkiv/m-pictex.mkiv
new file mode 100644
index 000000000..73aad3f57
--- /dev/null
+++ b/tex/context/modules/mkiv/m-pictex.mkiv
@@ -0,0 +1,46 @@
+%D \module
+%D   [       file=m-pictex,
+%D        version=1997.01.15,
+%D          title=\CONTEXT\ Extra Modules,
+%D       subtitle=\PICTEX\ Loading Macros,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Just in case someone still uses \PICTEX:
+
+\ifdefined\beginpicture \else
+
+    \ifdefined\grid \else
+        \let\normalgrid\grid
+    \fi
+
+    \ifdefined\axis \else
+        \let\normalaxis\axis
+    \fi
+
+    \ifdefined\fiverm \else
+        \font\fiverm=cmr5
+    \fi
+
+    \input prepictex.tex  \relax
+    \input pictex.tex     \relax
+    \input postpictex.tex \relax
+
+    \ifdefined\normalgrid
+        \let\pictexgrid\grid
+        \let\grid\normalgrid
+    \fi
+
+    \ifdefined\normalaxis
+        \let\pictexaxis\axis
+        \let\axis\normalaxis
+    \fi
+
+\fi
+
+\protect \endinput
diff --git a/tex/context/base/m-pipemode.mkiv b/tex/context/modules/mkiv/m-pipemode.mkiv
index e96394c43..e96394c43 100644
--- a/tex/context/base/m-pipemode.mkiv
+++ b/tex/context/modules/mkiv/m-pipemode.mkiv
diff --git a/tex/context/base/m-pstricks.lua b/tex/context/modules/mkiv/m-pstricks.lua
index b151e313a..b151e313a 100644
--- a/tex/context/base/m-pstricks.lua
+++ b/tex/context/modules/mkiv/m-pstricks.lua
diff --git a/tex/context/base/m-pstricks.mkiv b/tex/context/modules/mkiv/m-pstricks.mkiv
index 421607aaf..421607aaf 100644
--- a/tex/context/base/m-pstricks.mkiv
+++ b/tex/context/modules/mkiv/m-pstricks.mkiv
diff --git a/tex/context/base/m-punk.mkiv b/tex/context/modules/mkiv/m-punk.mkiv
index 331e90d2e..331e90d2e 100644
--- a/tex/context/base/m-punk.mkiv
+++ b/tex/context/modules/mkiv/m-punk.mkiv
diff --git a/tex/context/base/m-scite.mkiv b/tex/context/modules/mkiv/m-scite.mkiv
index 38c2f249e..38c2f249e 100644
--- a/tex/context/base/m-scite.mkiv
+++ b/tex/context/modules/mkiv/m-scite.mkiv
diff --git a/tex/context/base/m-spreadsheet.lua b/tex/context/modules/mkiv/m-spreadsheet.lua
index 1b3c5cb34..1b3c5cb34 100644
--- a/tex/context/base/m-spreadsheet.lua
+++ b/tex/context/modules/mkiv/m-spreadsheet.lua
diff --git a/tex/context/base/m-spreadsheet.mkiv b/tex/context/modules/mkiv/m-spreadsheet.mkiv
index 914a2b57a..914a2b57a 100644
--- a/tex/context/base/m-spreadsheet.mkiv
+++ b/tex/context/modules/mkiv/m-spreadsheet.mkiv
diff --git a/tex/context/base/m-sql.mkiv b/tex/context/modules/mkiv/m-sql.mkiv
index f1df2833a..f1df2833a 100644
--- a/tex/context/base/m-sql.mkiv
+++ b/tex/context/modules/mkiv/m-sql.mkiv
diff --git a/tex/context/base/m-steps.lua b/tex/context/modules/mkiv/m-steps.lua
index 8eb481550..8eb481550 100644
--- a/tex/context/base/m-steps.lua
+++ b/tex/context/modules/mkiv/m-steps.lua
diff --git a/tex/context/base/m-steps.mkvi b/tex/context/modules/mkiv/m-steps.mkvi
index c9c5a0636..c9c5a0636 100644
--- a/tex/context/base/m-steps.mkvi
+++ b/tex/context/modules/mkiv/m-steps.mkvi
diff --git a/tex/context/modules/mkiv/m-subsub.mkiv b/tex/context/modules/mkiv/m-subsub.mkiv
new file mode 100644
index 000000000..88be11680
--- /dev/null
+++ b/tex/context/modules/mkiv/m-subsub.mkiv
@@ -0,0 +1,76 @@
+%D \module
+%D   [       file=m-subsub,
+%D        version=2000.12.14,
+%D          title=\CONTEXT\ Private Modules,
+%D       subtitle=More Section Levels,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. This module is not public.
+
+\unprotect
+
+\definesection[\s!section-8]
+\definesection[\s!section-9]
+\definesection[\s!section-10]
+\definesection[\s!section-11]
+\definesection[\s!section-12]
+
+\definehead
+  [\v!subsubsubsubsubsection]
+  [\c!section=\s!section-8,
+   \c!default=\v!subsubsubsubsection]
+
+\definehead
+  [\v!subsubsubsubsubsubsection]
+  [\c!section=\s!section-9,
+   \c!default=\v!subsubsubsubsubsection]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsection]
+  [\c!section=\s!section-10,
+   \c!default=\v!subsubsubsubsubsubsection]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsubsection]
+  [\c!section=\s!section-11,
+   \c!default=\v!subsubsubsubsubsubsubsection]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsubsubsection]
+  [\c!section=\s!section-12,
+   \c!default=\v!subsubsubsubsubsubsubsubsection]
+
+\definehead
+  [\v!subsubsubsubsubsubject]
+  [\c!coupling=\v!subsubsubsubsubsection,
+   \c!default=\v!subsubsubsubsubsection,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!subsubsubsubsubsubsubject]
+  [\c!coupling=\v!subsubsubsubsubsubsection,
+   \c!default=\v!subsubsubsubsubsubsection,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsubject]
+  [\c!coupling=\v!subsubsubsubsubsubsubsection,
+   \c!default=\v!subsubsubsubsubsubsubsection,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsubsubject]
+  [\c!coupling=\v!subsubsubsubsubsubsubsubsection,
+   \c!default=\v!subsubsubsubsubsubsubsubsection,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!subsubsubsubsubsubsubsubsubsubject]
+  [\c!coupling=\v!subsubsubsubsubsubsubsubsubsection,
+   \c!default=\v!subsubsubsubsubsubsubsubsubsection,
+   \c!incrementnumber=\v!no]
+
+\protect \endinput
diff --git a/tex/context/base/m-timing.mkiv b/tex/context/modules/mkiv/m-timing.mkiv
index 5502768f6..5502768f6 100644
--- a/tex/context/base/m-timing.mkiv
+++ b/tex/context/modules/mkiv/m-timing.mkiv
diff --git a/tex/context/base/m-trackers.mkiv b/tex/context/modules/mkiv/m-trackers.mkiv
index 95c34b16f..95c34b16f 100644
--- a/tex/context/base/m-trackers.mkiv
+++ b/tex/context/modules/mkiv/m-trackers.mkiv
diff --git a/tex/context/base/m-translate.mkiv b/tex/context/modules/mkiv/m-translate.mkiv
index 2e6cbe950..2e6cbe950 100644
--- a/tex/context/base/m-translate.mkiv
+++ b/tex/context/modules/mkiv/m-translate.mkiv
diff --git a/tex/context/base/m-units.mkiv b/tex/context/modules/mkiv/m-units.mkiv
index b0db8d548..b0db8d548 100644
--- a/tex/context/base/m-units.mkiv
+++ b/tex/context/modules/mkiv/m-units.mkiv
diff --git a/tex/context/base/m-visual.mkiv b/tex/context/modules/mkiv/m-visual.mkiv
index d50215966..d50215966 100644
--- a/tex/context/base/m-visual.mkiv
+++ b/tex/context/modules/mkiv/m-visual.mkiv
diff --git a/tex/context/base/m-zint.mkiv b/tex/context/modules/mkiv/m-zint.mkiv
index 4957c8461..4957c8461 100644
--- a/tex/context/base/m-zint.mkiv
+++ b/tex/context/modules/mkiv/m-zint.mkiv
diff --git a/tex/context/base/ppchtex.mkiv b/tex/context/modules/mkiv/ppchtex.mkiv
index d1167d414..d1167d414 100644
--- a/tex/context/base/ppchtex.mkiv
+++ b/tex/context/modules/mkiv/ppchtex.mkiv
diff --git a/tex/context/base/s-art-01.mkiv b/tex/context/modules/mkiv/s-art-01.mkiv
index 601ee1adc..601ee1adc 100644
--- a/tex/context/base/s-art-01.mkiv
+++ b/tex/context/modules/mkiv/s-art-01.mkiv
diff --git a/tex/context/base/s-def-01.mkiv b/tex/context/modules/mkiv/s-def-01.mkiv
index 49e585bd0..49e585bd0 100644
--- a/tex/context/base/s-def-01.mkiv
+++ b/tex/context/modules/mkiv/s-def-01.mkiv
diff --git a/tex/context/base/s-figures-names.mkiv b/tex/context/modules/mkiv/s-figures-names.mkiv
index a2782efc9..a2782efc9 100644
--- a/tex/context/base/s-figures-names.mkiv
+++ b/tex/context/modules/mkiv/s-figures-names.mkiv
diff --git a/tex/context/base/s-fnt-10.mkiv b/tex/context/modules/mkiv/s-fnt-10.mkiv
index 2fe82e079..731c4be39 100644
--- a/tex/context/base/s-fnt-10.mkiv
+++ b/tex/context/modules/mkiv/s-fnt-10.mkiv
@@ -28,6 +28,9 @@ local fontdata = fonts.hashes.identifiers
 --     end
 -- end
 
+local context = context
+local escaped = context.escaped
+
 function fonts.tracers.show_all()
     local tfmdata = fontdata[font.current()]
     if tfmdata then
@@ -79,9 +82,9 @@ function fonts.tracers.show_all()
             NC() tttf() context("U+%05X",unicode)
             NC()        char(unicode)
             NC() tttf() context("%05X",index)
-            NC() tttf() context(gname)
-            NC() tttf() context(aname)
-            NC() tttf() context(cname)
+            NC() if gname ~= "" then tttf() escaped(gname) end
+            NC() if aname ~= "" then tttf() context(aname) end
+            NC() if cname ~= "" then tttf() context(cname) end
             NC() NR()
         end
         context.stoptabulate()
diff --git a/tex/context/base/s-fnt-20.mkiv b/tex/context/modules/mkiv/s-fnt-20.mkiv
index 584043099..584043099 100644
--- a/tex/context/base/s-fnt-20.mkiv
+++ b/tex/context/modules/mkiv/s-fnt-20.mkiv
diff --git a/tex/context/base/s-fnt-21.mkiv b/tex/context/modules/mkiv/s-fnt-21.mkiv
index 10d5a4623..10d5a4623 100644
--- a/tex/context/base/s-fnt-21.mkiv
+++ b/tex/context/modules/mkiv/s-fnt-21.mkiv
diff --git a/tex/context/base/s-fnt-24.mkiv b/tex/context/modules/mkiv/s-fnt-24.mkiv
index 2e6b9a591..2e6b9a591 100644
--- a/tex/context/base/s-fnt-24.mkiv
+++ b/tex/context/modules/mkiv/s-fnt-24.mkiv
diff --git a/tex/context/base/s-fonts-charts.mkiv b/tex/context/modules/mkiv/s-fonts-charts.mkiv
index e94b52a2e..e94b52a2e 100644
--- a/tex/context/base/s-fonts-charts.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-charts.mkiv
diff --git a/tex/context/base/s-fonts-coverage.lua b/tex/context/modules/mkiv/s-fonts-coverage.lua
index dd772d5f0..dd772d5f0 100644
--- a/tex/context/base/s-fonts-coverage.lua
+++ b/tex/context/modules/mkiv/s-fonts-coverage.lua
diff --git a/tex/context/base/s-fonts-coverage.mkiv b/tex/context/modules/mkiv/s-fonts-coverage.mkiv
index c09d943bc..c09d943bc 100644
--- a/tex/context/base/s-fonts-coverage.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-coverage.mkiv
diff --git a/tex/context/base/s-fonts-features.lua b/tex/context/modules/mkiv/s-fonts-features.lua
index 0a7cf8b13..0a7cf8b13 100644
--- a/tex/context/base/s-fonts-features.lua
+++ b/tex/context/modules/mkiv/s-fonts-features.lua
diff --git a/tex/context/base/s-fonts-features.mkiv b/tex/context/modules/mkiv/s-fonts-features.mkiv
index b81b53a71..b81b53a71 100644
--- a/tex/context/base/s-fonts-features.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-features.mkiv
diff --git a/tex/context/base/s-fonts-goodies.lua b/tex/context/modules/mkiv/s-fonts-goodies.lua
index 381fc45ea..381fc45ea 100644
--- a/tex/context/base/s-fonts-goodies.lua
+++ b/tex/context/modules/mkiv/s-fonts-goodies.lua
diff --git a/tex/context/base/s-fonts-goodies.mkiv b/tex/context/modules/mkiv/s-fonts-goodies.mkiv
index e596507af..e596507af 100644
--- a/tex/context/base/s-fonts-goodies.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-goodies.mkiv
diff --git a/tex/context/base/s-fonts-ligatures.mkiv b/tex/context/modules/mkiv/s-fonts-ligatures.mkiv
index fc49ec5c5..fc49ec5c5 100644
--- a/tex/context/base/s-fonts-ligatures.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-ligatures.mkiv
diff --git a/tex/context/base/s-fonts-missing.lua b/tex/context/modules/mkiv/s-fonts-missing.lua
index 9a75676a9..9a75676a9 100644
--- a/tex/context/base/s-fonts-missing.lua
+++ b/tex/context/modules/mkiv/s-fonts-missing.lua
diff --git a/tex/context/base/s-fonts-missing.mkiv b/tex/context/modules/mkiv/s-fonts-missing.mkiv
index c566f4995..c566f4995 100644
--- a/tex/context/base/s-fonts-missing.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-missing.mkiv
diff --git a/tex/context/base/s-fonts-shapes.lua b/tex/context/modules/mkiv/s-fonts-shapes.lua
index 8f872e4bc..8f872e4bc 100644
--- a/tex/context/base/s-fonts-shapes.lua
+++ b/tex/context/modules/mkiv/s-fonts-shapes.lua
diff --git a/tex/context/base/s-fonts-shapes.mkiv b/tex/context/modules/mkiv/s-fonts-shapes.mkiv
index c1e9d61d2..c1e9d61d2 100644
--- a/tex/context/base/s-fonts-shapes.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-shapes.mkiv
diff --git a/tex/context/base/s-fonts-system.lua b/tex/context/modules/mkiv/s-fonts-system.lua
index 0c0ad4d86..0c0ad4d86 100644
--- a/tex/context/base/s-fonts-system.lua
+++ b/tex/context/modules/mkiv/s-fonts-system.lua
diff --git a/tex/context/base/s-fonts-system.mkiv b/tex/context/modules/mkiv/s-fonts-system.mkiv
index 6d9082a6b..6d9082a6b 100644
--- a/tex/context/base/s-fonts-system.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-system.mkiv
diff --git a/tex/context/base/s-fonts-tables.lua b/tex/context/modules/mkiv/s-fonts-tables.lua
index c32f4628c..c32f4628c 100644
--- a/tex/context/base/s-fonts-tables.lua
+++ b/tex/context/modules/mkiv/s-fonts-tables.lua
diff --git a/tex/context/base/s-fonts-tables.mkiv b/tex/context/modules/mkiv/s-fonts-tables.mkiv
index 64fe76f0e..64fe76f0e 100644
--- a/tex/context/base/s-fonts-tables.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-tables.mkiv
diff --git a/tex/context/base/s-fonts-vectors.lua b/tex/context/modules/mkiv/s-fonts-vectors.lua
index af8042f84..af8042f84 100644
--- a/tex/context/base/s-fonts-vectors.lua
+++ b/tex/context/modules/mkiv/s-fonts-vectors.lua
diff --git a/tex/context/base/s-fonts-vectors.mkiv b/tex/context/modules/mkiv/s-fonts-vectors.mkiv
index 2605fe964..2605fe964 100644
--- a/tex/context/base/s-fonts-vectors.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-vectors.mkiv
diff --git a/tex/context/base/s-inf-01.mkvi b/tex/context/modules/mkiv/s-inf-01.mkvi
index 2c0c1681e..2c0c1681e 100644
--- a/tex/context/base/s-inf-01.mkvi
+++ b/tex/context/modules/mkiv/s-inf-01.mkvi
diff --git a/tex/context/base/s-inf-02.mkiv b/tex/context/modules/mkiv/s-inf-02.mkiv
index cf8d572bc..cf8d572bc 100644
--- a/tex/context/base/s-inf-02.mkiv
+++ b/tex/context/modules/mkiv/s-inf-02.mkiv
diff --git a/tex/context/base/s-inf-03.mkiv b/tex/context/modules/mkiv/s-inf-03.mkiv
index a253bed77..a253bed77 100644
--- a/tex/context/base/s-inf-03.mkiv
+++ b/tex/context/modules/mkiv/s-inf-03.mkiv
diff --git a/tex/context/base/s-inf-04.mkiv b/tex/context/modules/mkiv/s-inf-04.mkiv
index 862bed72f..862bed72f 100644
--- a/tex/context/base/s-inf-04.mkiv
+++ b/tex/context/modules/mkiv/s-inf-04.mkiv
diff --git a/tex/context/base/s-languages-counters.lua b/tex/context/modules/mkiv/s-languages-counters.lua
index 436e64a64..436e64a64 100644
--- a/tex/context/base/s-languages-counters.lua
+++ b/tex/context/modules/mkiv/s-languages-counters.lua
diff --git a/tex/context/base/s-languages-counters.mkiv b/tex/context/modules/mkiv/s-languages-counters.mkiv
index fa938d65a..fa938d65a 100644
--- a/tex/context/base/s-languages-counters.mkiv
+++ b/tex/context/modules/mkiv/s-languages-counters.mkiv
diff --git a/tex/context/base/s-languages-frequencies.lua b/tex/context/modules/mkiv/s-languages-frequencies.lua
index 16213a412..16213a412 100644
--- a/tex/context/base/s-languages-frequencies.lua
+++ b/tex/context/modules/mkiv/s-languages-frequencies.lua
diff --git a/tex/context/base/s-languages-frequencies.mkiv b/tex/context/modules/mkiv/s-languages-frequencies.mkiv
index 01a1f5682..01a1f5682 100644
--- a/tex/context/base/s-languages-frequencies.mkiv
+++ b/tex/context/modules/mkiv/s-languages-frequencies.mkiv
diff --git a/tex/context/base/s-languages-hyphenation.lua b/tex/context/modules/mkiv/s-languages-hyphenation.lua
index c5a4f91f1..c5a4f91f1 100644
--- a/tex/context/base/s-languages-hyphenation.lua
+++ b/tex/context/modules/mkiv/s-languages-hyphenation.lua
diff --git a/tex/context/base/s-languages-hyphenation.mkiv b/tex/context/modules/mkiv/s-languages-hyphenation.mkiv
index 6662dbf2f..6662dbf2f 100644
--- a/tex/context/base/s-languages-hyphenation.mkiv
+++ b/tex/context/modules/mkiv/s-languages-hyphenation.mkiv
diff --git a/tex/context/base/s-languages-sorting.lua b/tex/context/modules/mkiv/s-languages-sorting.lua
index 82a0827bb..82a0827bb 100644
--- a/tex/context/base/s-languages-sorting.lua
+++ b/tex/context/modules/mkiv/s-languages-sorting.lua
diff --git a/tex/context/base/s-languages-sorting.mkiv b/tex/context/modules/mkiv/s-languages-sorting.mkiv
index 67acda6f9..67acda6f9 100644
--- a/tex/context/base/s-languages-sorting.mkiv
+++ b/tex/context/modules/mkiv/s-languages-sorting.mkiv
diff --git a/tex/context/base/s-languages-system.lua b/tex/context/modules/mkiv/s-languages-system.lua
index 3b422db9f..3b422db9f 100644
--- a/tex/context/base/s-languages-system.lua
+++ b/tex/context/modules/mkiv/s-languages-system.lua
diff --git a/tex/context/base/s-languages-system.mkiv b/tex/context/modules/mkiv/s-languages-system.mkiv
index 22991f264..22991f264 100644
--- a/tex/context/base/s-languages-system.mkiv
+++ b/tex/context/modules/mkiv/s-languages-system.mkiv
diff --git a/tex/context/base/s-languages-words.lua b/tex/context/modules/mkiv/s-languages-words.lua
index ea7aee87b..ea7aee87b 100644
--- a/tex/context/base/s-languages-words.lua
+++ b/tex/context/modules/mkiv/s-languages-words.lua
diff --git a/tex/context/base/s-languages-words.mkiv b/tex/context/modules/mkiv/s-languages-words.mkiv
index 4e350bf34..4e350bf34 100644
--- a/tex/context/base/s-languages-words.mkiv
+++ b/tex/context/modules/mkiv/s-languages-words.mkiv
diff --git a/tex/context/base/s-map-10.mkiv b/tex/context/modules/mkiv/s-map-10.mkiv
index c7541babc..c7541babc 100644
--- a/tex/context/base/s-map-10.mkiv
+++ b/tex/context/modules/mkiv/s-map-10.mkiv
diff --git a/tex/context/base/s-math-characters.lua b/tex/context/modules/mkiv/s-math-characters.lua
index 8ff3a8660..8ff3a8660 100644
--- a/tex/context/base/s-math-characters.lua
+++ b/tex/context/modules/mkiv/s-math-characters.lua
diff --git a/tex/context/base/s-math-characters.mkiv b/tex/context/modules/mkiv/s-math-characters.mkiv
index 3b273cb6c..3b273cb6c 100644
--- a/tex/context/base/s-math-characters.mkiv
+++ b/tex/context/modules/mkiv/s-math-characters.mkiv
diff --git a/tex/context/base/s-math-coverage.lua b/tex/context/modules/mkiv/s-math-coverage.lua
index 3c6080dc3..3c6080dc3 100644
--- a/tex/context/base/s-math-coverage.lua
+++ b/tex/context/modules/mkiv/s-math-coverage.lua
diff --git a/tex/context/base/s-math-coverage.mkiv b/tex/context/modules/mkiv/s-math-coverage.mkiv
index e318c9eff..e318c9eff 100644
--- a/tex/context/base/s-math-coverage.mkiv
+++ b/tex/context/modules/mkiv/s-math-coverage.mkiv
diff --git a/tex/context/base/s-math-extensibles.mkiv b/tex/context/modules/mkiv/s-math-extensibles.mkiv
index f9ff8547a..f9ff8547a 100644
--- a/tex/context/base/s-math-extensibles.mkiv
+++ b/tex/context/modules/mkiv/s-math-extensibles.mkiv
diff --git a/tex/context/base/s-math-parameters.lua b/tex/context/modules/mkiv/s-math-parameters.lua
index 8e8c15a2d..8e8c15a2d 100644
--- a/tex/context/base/s-math-parameters.lua
+++ b/tex/context/modules/mkiv/s-math-parameters.lua
diff --git a/tex/context/base/s-math-parameters.mkiv b/tex/context/modules/mkiv/s-math-parameters.mkiv
index f2fde5d83..f2fde5d83 100644
--- a/tex/context/base/s-math-parameters.mkiv
+++ b/tex/context/modules/mkiv/s-math-parameters.mkiv
diff --git a/tex/context/base/s-math-repertoire.mkiv b/tex/context/modules/mkiv/s-math-repertoire.mkiv
index 230eb513e..230eb513e 100644
--- a/tex/context/base/s-math-repertoire.mkiv
+++ b/tex/context/modules/mkiv/s-math-repertoire.mkiv
diff --git a/tex/context/base/s-mod-00.mkiv b/tex/context/modules/mkiv/s-mod-00.mkiv
index 7af56dc2d..7af56dc2d 100644
--- a/tex/context/base/s-mod-00.mkiv
+++ b/tex/context/modules/mkiv/s-mod-00.mkiv
diff --git a/tex/context/base/s-mod-01.mkiv b/tex/context/modules/mkiv/s-mod-01.mkiv
index 6946bef69..6946bef69 100644
--- a/tex/context/base/s-mod-01.mkiv
+++ b/tex/context/modules/mkiv/s-mod-01.mkiv
diff --git a/tex/context/base/s-mod-02.mkiv b/tex/context/modules/mkiv/s-mod-02.mkiv
index 37e3d2f14..37e3d2f14 100644
--- a/tex/context/base/s-mod-02.mkiv
+++ b/tex/context/modules/mkiv/s-mod-02.mkiv
diff --git a/tex/context/base/s-pages-statistics.mkiv b/tex/context/modules/mkiv/s-pages-statistics.mkiv
index 375dd9949..375dd9949 100644
--- a/tex/context/base/s-pages-statistics.mkiv
+++ b/tex/context/modules/mkiv/s-pages-statistics.mkiv
diff --git a/tex/context/base/s-physics-units.mkiv b/tex/context/modules/mkiv/s-physics-units.mkiv
index 50adc8014..50adc8014 100644
--- a/tex/context/base/s-physics-units.mkiv
+++ b/tex/context/modules/mkiv/s-physics-units.mkiv
diff --git a/tex/context/base/s-pre-17.mkiv b/tex/context/modules/mkiv/s-pre-17.mkiv
index 9c46b4ed7..9c46b4ed7 100644
--- a/tex/context/base/s-pre-17.mkiv
+++ b/tex/context/modules/mkiv/s-pre-17.mkiv
diff --git a/tex/context/base/s-pre-30.mkiv b/tex/context/modules/mkiv/s-pre-30.mkiv
index 1be85d02b..1be85d02b 100644
--- a/tex/context/base/s-pre-30.mkiv
+++ b/tex/context/modules/mkiv/s-pre-30.mkiv
diff --git a/tex/context/base/s-pre-60.mkiv b/tex/context/modules/mkiv/s-pre-60.mkiv
index 70f8978b0..70f8978b0 100644
--- a/tex/context/base/s-pre-60.mkiv
+++ b/tex/context/modules/mkiv/s-pre-60.mkiv
diff --git a/tex/context/base/s-pre-69.mkiv b/tex/context/modules/mkiv/s-pre-69.mkiv
index cc6af9ad3..cc6af9ad3 100644
--- a/tex/context/base/s-pre-69.mkiv
+++ b/tex/context/modules/mkiv/s-pre-69.mkiv
diff --git a/tex/context/base/s-pre-70.mkiv b/tex/context/modules/mkiv/s-pre-70.mkiv
index 2c8bb2d26..2c8bb2d26 100644
--- a/tex/context/base/s-pre-70.mkiv
+++ b/tex/context/modules/mkiv/s-pre-70.mkiv
diff --git a/tex/context/base/s-pre-71.lua b/tex/context/modules/mkiv/s-pre-71.lua
index bfa45a705..bfa45a705 100644
--- a/tex/context/base/s-pre-71.lua
+++ b/tex/context/modules/mkiv/s-pre-71.lua
diff --git a/tex/context/base/s-pre-71.mkiv b/tex/context/modules/mkiv/s-pre-71.mkiv
index 38dae61df..38dae61df 100644
--- a/tex/context/base/s-pre-71.mkiv
+++ b/tex/context/modules/mkiv/s-pre-71.mkiv
diff --git a/tex/context/base/s-present-tiles.mkiv b/tex/context/modules/mkiv/s-present-tiles.mkiv
index b68a34ef4..b68a34ef4 100644
--- a/tex/context/base/s-present-tiles.mkiv
+++ b/tex/context/modules/mkiv/s-present-tiles.mkiv
diff --git a/tex/context/base/s-references-show.mkiv b/tex/context/modules/mkiv/s-references-show.mkiv
index 72cccce54..72cccce54 100644
--- a/tex/context/base/s-references-show.mkiv
+++ b/tex/context/modules/mkiv/s-references-show.mkiv
diff --git a/tex/context/base/s-reg-01.mkiv b/tex/context/modules/mkiv/s-reg-01.mkiv
index 36434c30c..36434c30c 100644
--- a/tex/context/base/s-reg-01.mkiv
+++ b/tex/context/modules/mkiv/s-reg-01.mkiv
diff --git a/tex/context/base/s-set-31.mkiv b/tex/context/modules/mkiv/s-set-31.mkiv
index 53037a78d..53037a78d 100644
--- a/tex/context/base/s-set-31.mkiv
+++ b/tex/context/modules/mkiv/s-set-31.mkiv
diff --git a/tex/context/base/s-sql-tables.lua b/tex/context/modules/mkiv/s-sql-tables.lua
index 434103541..434103541 100644
--- a/tex/context/base/s-sql-tables.lua
+++ b/tex/context/modules/mkiv/s-sql-tables.lua
diff --git a/tex/context/base/s-sql-tables.mkiv b/tex/context/modules/mkiv/s-sql-tables.mkiv
index 4c8bcddac..4c8bcddac 100644
--- a/tex/context/base/s-sql-tables.mkiv
+++ b/tex/context/modules/mkiv/s-sql-tables.mkiv
diff --git a/tex/context/base/s-structure-sections.mkiv b/tex/context/modules/mkiv/s-structure-sections.mkiv
index daaab5abc..daaab5abc 100644
--- a/tex/context/base/s-structure-sections.mkiv
+++ b/tex/context/modules/mkiv/s-structure-sections.mkiv
diff --git a/tex/context/base/s-syntax.mkiv b/tex/context/modules/mkiv/s-syntax.mkiv
index 96312f771..96312f771 100644
--- a/tex/context/base/s-syntax.mkiv
+++ b/tex/context/modules/mkiv/s-syntax.mkiv
diff --git a/tex/context/base/s-typesetting-kerning.mkiv b/tex/context/modules/mkiv/s-typesetting-kerning.mkiv
index 48d81ce36..48d81ce36 100644
--- a/tex/context/base/s-typesetting-kerning.mkiv
+++ b/tex/context/modules/mkiv/s-typesetting-kerning.mkiv
diff --git a/tex/context/base/s-youless.mkiv b/tex/context/modules/mkiv/s-youless.mkiv
index e15973b9c..e15973b9c 100644
--- a/tex/context/base/s-youless.mkiv
+++ b/tex/context/modules/mkiv/s-youless.mkiv
diff --git a/tex/context/base/x-asciimath.lua b/tex/context/modules/mkiv/x-asciimath.lua
index e0a4a714b..e0a4a714b 100644
--- a/tex/context/base/x-asciimath.lua
+++ b/tex/context/modules/mkiv/x-asciimath.lua
diff --git a/tex/context/base/x-asciimath.mkiv b/tex/context/modules/mkiv/x-asciimath.mkiv
index d3a629c81..d3a629c81 100644
--- a/tex/context/base/x-asciimath.mkiv
+++ b/tex/context/modules/mkiv/x-asciimath.mkiv
diff --git a/tex/context/base/x-calcmath.lua b/tex/context/modules/mkiv/x-calcmath.lua
index c96d8d0ac..c96d8d0ac 100644
--- a/tex/context/base/x-calcmath.lua
+++ b/tex/context/modules/mkiv/x-calcmath.lua
diff --git a/tex/context/base/x-calcmath.mkiv b/tex/context/modules/mkiv/x-calcmath.mkiv
index dda88bb3e..dda88bb3e 100644
--- a/tex/context/base/x-calcmath.mkiv
+++ b/tex/context/modules/mkiv/x-calcmath.mkiv
diff --git a/tex/context/base/x-cals.lua b/tex/context/modules/mkiv/x-cals.lua
index 3af6106d8..3af6106d8 100644
--- a/tex/context/base/x-cals.lua
+++ b/tex/context/modules/mkiv/x-cals.lua
diff --git a/tex/context/base/x-cals.mkiv b/tex/context/modules/mkiv/x-cals.mkiv
index 31ba2d213..31ba2d213 100644
--- a/tex/context/base/x-cals.mkiv
+++ b/tex/context/modules/mkiv/x-cals.mkiv
diff --git a/tex/context/base/x-chemml.lua b/tex/context/modules/mkiv/x-chemml.lua
index 79c1d9525..79c1d9525 100644
--- a/tex/context/base/x-chemml.lua
+++ b/tex/context/modules/mkiv/x-chemml.lua
diff --git a/tex/context/base/x-chemml.mkiv b/tex/context/modules/mkiv/x-chemml.mkiv
index bb9065921..bb9065921 100644
--- a/tex/context/base/x-chemml.mkiv
+++ b/tex/context/modules/mkiv/x-chemml.mkiv
diff --git a/tex/context/base/x-ct.lua b/tex/context/modules/mkiv/x-ct.lua
index 9c647e8e7..9c647e8e7 100644
--- a/tex/context/base/x-ct.lua
+++ b/tex/context/modules/mkiv/x-ct.lua
diff --git a/tex/context/base/x-ct.mkiv b/tex/context/modules/mkiv/x-ct.mkiv
index 6a6352f03..6a6352f03 100644
--- a/tex/context/base/x-ct.mkiv
+++ b/tex/context/modules/mkiv/x-ct.mkiv
diff --git a/tex/context/base/x-entities.mkiv b/tex/context/modules/mkiv/x-entities.mkiv
index 3dd02118a..3dd02118a 100644
--- a/tex/context/base/x-entities.mkiv
+++ b/tex/context/modules/mkiv/x-entities.mkiv
diff --git a/tex/context/base/x-foxet.mkiv b/tex/context/modules/mkiv/x-foxet.mkiv
index 80fe7e500..80fe7e500 100644
--- a/tex/context/base/x-foxet.mkiv
+++ b/tex/context/modules/mkiv/x-foxet.mkiv
diff --git a/tex/context/base/x-html.mkiv b/tex/context/modules/mkiv/x-html.mkiv
index e1806eb9e..e1806eb9e 100644
--- a/tex/context/base/x-html.mkiv
+++ b/tex/context/modules/mkiv/x-html.mkiv
diff --git a/tex/context/base/x-ldx.ctx b/tex/context/modules/mkiv/x-ldx.ctx
index edbffc285..edbffc285 100644
--- a/tex/context/base/x-ldx.ctx
+++ b/tex/context/modules/mkiv/x-ldx.ctx
diff --git a/tex/context/base/x-ldx.lua b/tex/context/modules/mkiv/x-ldx.lua
index 31cbebf13..31cbebf13 100644
--- a/tex/context/base/x-ldx.lua
+++ b/tex/context/modules/mkiv/x-ldx.lua
diff --git a/tex/context/base/x-ldx.mkiv b/tex/context/modules/mkiv/x-ldx.mkiv
index 0156f2c55..0156f2c55 100644
--- a/tex/context/base/x-ldx.mkiv
+++ b/tex/context/modules/mkiv/x-ldx.mkiv
diff --git a/tex/context/base/x-math-svg.lua b/tex/context/modules/mkiv/x-math-svg.lua
index 8a6288167..8a6288167 100644
--- a/tex/context/base/x-math-svg.lua
+++ b/tex/context/modules/mkiv/x-math-svg.lua
diff --git a/tex/context/base/x-mathml-basics.mkiv b/tex/context/modules/mkiv/x-mathml-basics.mkiv
index e166995b0..e166995b0 100644
--- a/tex/context/base/x-mathml-basics.mkiv
+++ b/tex/context/modules/mkiv/x-mathml-basics.mkiv
diff --git a/tex/context/base/x-mathml-html.mkiv b/tex/context/modules/mkiv/x-mathml-html.mkiv
index 2ac7d3cba..2ac7d3cba 100644
--- a/tex/context/base/x-mathml-html.mkiv
+++ b/tex/context/modules/mkiv/x-mathml-html.mkiv
diff --git a/tex/context/base/x-mathml.lua b/tex/context/modules/mkiv/x-mathml.lua
index 50369407f..50369407f 100644
--- a/tex/context/base/x-mathml.lua
+++ b/tex/context/modules/mkiv/x-mathml.lua
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/modules/mkiv/x-mathml.mkiv
index ec56aa3df..ec56aa3df 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/modules/mkiv/x-mathml.mkiv
diff --git a/tex/context/base/x-newmml.mkiv b/tex/context/modules/mkiv/x-newmml.mkiv
index 4c12daeee..4c12daeee 100644
--- a/tex/context/base/x-newmml.mkiv
+++ b/tex/context/modules/mkiv/x-newmml.mkiv
diff --git a/tex/context/base/x-pfs-01.mkiv b/tex/context/modules/mkiv/x-pfs-01.mkiv
index 8b06bd873..8b06bd873 100644
--- a/tex/context/base/x-pfs-01.mkiv
+++ b/tex/context/modules/mkiv/x-pfs-01.mkiv
diff --git a/tex/context/base/x-pfsense.ctx b/tex/context/modules/mkiv/x-pfsense.ctx
index 8d7087cf2..8d7087cf2 100644
--- a/tex/context/base/x-pfsense.ctx
+++ b/tex/context/modules/mkiv/x-pfsense.ctx
diff --git a/tex/context/base/x-physml.mkiv b/tex/context/modules/mkiv/x-physml.mkiv
index dd9a164dd..dd9a164dd 100644
--- a/tex/context/base/x-physml.mkiv
+++ b/tex/context/modules/mkiv/x-physml.mkiv
diff --git a/tex/context/base/x-res-01.mkiv b/tex/context/modules/mkiv/x-res-01.mkiv
index 36070c615..36070c615 100644
--- a/tex/context/base/x-res-01.mkiv
+++ b/tex/context/modules/mkiv/x-res-01.mkiv
diff --git a/tex/context/base/x-res-50.mkiv b/tex/context/modules/mkiv/x-res-50.mkiv
index 62a86b7a7..62a86b7a7 100644
--- a/tex/context/base/x-res-50.mkiv
+++ b/tex/context/modules/mkiv/x-res-50.mkiv
diff --git a/tex/context/base/x-set-11.mkiv b/tex/context/modules/mkiv/x-set-11.mkiv
index c82b9735d..c82b9735d 100644
--- a/tex/context/base/x-set-11.mkiv
+++ b/tex/context/modules/mkiv/x-set-11.mkiv
diff --git a/tex/context/base/x-set-12.mkiv b/tex/context/modules/mkiv/x-set-12.mkiv
index c60445313..c60445313 100644
--- a/tex/context/base/x-set-12.mkiv
+++ b/tex/context/modules/mkiv/x-set-12.mkiv
diff --git a/tex/context/base/x-steps.mkiv b/tex/context/modules/mkiv/x-steps.mkiv
index 29b3f7eaa..29b3f7eaa 100644
--- a/tex/context/base/x-steps.mkiv
+++ b/tex/context/modules/mkiv/x-steps.mkiv
diff --git a/tex/context/base/x-udhr.mkiv b/tex/context/modules/mkiv/x-udhr.mkiv
index e081bfd59..e081bfd59 100644
--- a/tex/context/base/x-udhr.mkiv
+++ b/tex/context/modules/mkiv/x-udhr.mkiv
diff --git a/tex/context/base/x-xfdf.mkiv b/tex/context/modules/mkiv/x-xfdf.mkiv
index 460220ed9..460220ed9 100644
--- a/tex/context/base/x-xfdf.mkiv
+++ b/tex/context/modules/mkiv/x-xfdf.mkiv
diff --git a/tex/context/patterns/lang-af.rme b/tex/context/patterns/common/lang-af.rme
index 33d7d34bb..33d7d34bb 100644
--- a/tex/context/patterns/lang-af.rme
+++ b/tex/context/patterns/common/lang-af.rme
diff --git a/tex/context/patterns/lang-agr.rme b/tex/context/patterns/common/lang-agr.rme
index 72362908e..72362908e 100644
--- a/tex/context/patterns/lang-agr.rme
+++ b/tex/context/patterns/common/lang-agr.rme
diff --git a/tex/context/patterns/lang-ala.rme b/tex/context/patterns/common/lang-ala.rme
index cb848c1aa..cb848c1aa 100644
--- a/tex/context/patterns/lang-ala.rme
+++ b/tex/context/patterns/common/lang-ala.rme
diff --git a/tex/context/patterns/lang-bg.rme b/tex/context/patterns/common/lang-bg.rme
index 840bb53a3..840bb53a3 100644
--- a/tex/context/patterns/lang-bg.rme
+++ b/tex/context/patterns/common/lang-bg.rme
diff --git a/tex/context/patterns/lang-ca.rme b/tex/context/patterns/common/lang-ca.rme
index b753fac73..b753fac73 100644
--- a/tex/context/patterns/lang-ca.rme
+++ b/tex/context/patterns/common/lang-ca.rme
diff --git a/tex/context/patterns/lang-cs.rme b/tex/context/patterns/common/lang-cs.rme
index 6bbcd04a0..6bbcd04a0 100644
--- a/tex/context/patterns/lang-cs.rme
+++ b/tex/context/patterns/common/lang-cs.rme
diff --git a/tex/context/patterns/lang-cy.rme b/tex/context/patterns/common/lang-cy.rme
index f05dfdfe4..f05dfdfe4 100644
--- a/tex/context/patterns/lang-cy.rme
+++ b/tex/context/patterns/common/lang-cy.rme
diff --git a/tex/context/patterns/lang-da.rme b/tex/context/patterns/common/lang-da.rme
index 80fe2df39..80fe2df39 100644
--- a/tex/context/patterns/lang-da.rme
+++ b/tex/context/patterns/common/lang-da.rme
diff --git a/tex/context/patterns/lang-de.rme b/tex/context/patterns/common/lang-de.rme
index b8bdfeb6c..b8bdfeb6c 100644
--- a/tex/context/patterns/lang-de.rme
+++ b/tex/context/patterns/common/lang-de.rme
diff --git a/tex/context/patterns/lang-deo.rme b/tex/context/patterns/common/lang-deo.rme
index 88956d433..88956d433 100644
--- a/tex/context/patterns/lang-deo.rme
+++ b/tex/context/patterns/common/lang-deo.rme
diff --git a/tex/context/patterns/lang-es.rme b/tex/context/patterns/common/lang-es.rme
index ab87247ea..ab87247ea 100644
--- a/tex/context/patterns/lang-es.rme
+++ b/tex/context/patterns/common/lang-es.rme
diff --git a/tex/context/patterns/lang-et.rme b/tex/context/patterns/common/lang-et.rme
index db400db09..db400db09 100644
--- a/tex/context/patterns/lang-et.rme
+++ b/tex/context/patterns/common/lang-et.rme
diff --git a/tex/context/patterns/lang-eu.rme b/tex/context/patterns/common/lang-eu.rme
index 72d2a596d..72d2a596d 100644
--- a/tex/context/patterns/lang-eu.rme
+++ b/tex/context/patterns/common/lang-eu.rme
diff --git a/tex/context/patterns/lang-fi.rme b/tex/context/patterns/common/lang-fi.rme
index b66d6bb85..b66d6bb85 100644
--- a/tex/context/patterns/lang-fi.rme
+++ b/tex/context/patterns/common/lang-fi.rme
diff --git a/tex/context/patterns/lang-fr.rme b/tex/context/patterns/common/lang-fr.rme
index 335c94c05..335c94c05 100644
--- a/tex/context/patterns/lang-fr.rme
+++ b/tex/context/patterns/common/lang-fr.rme
diff --git a/tex/context/patterns/lang-gb.rme b/tex/context/patterns/common/lang-gb.rme
index 40b787800..40b787800 100644
--- a/tex/context/patterns/lang-gb.rme
+++ b/tex/context/patterns/common/lang-gb.rme
diff --git a/tex/context/patterns/lang-hr.rme b/tex/context/patterns/common/lang-hr.rme
index e3c0471cc..e3c0471cc 100644
--- a/tex/context/patterns/lang-hr.rme
+++ b/tex/context/patterns/common/lang-hr.rme
diff --git a/tex/context/patterns/lang-hu.rme b/tex/context/patterns/common/lang-hu.rme
index 49247877c..49247877c 100644
--- a/tex/context/patterns/lang-hu.rme
+++ b/tex/context/patterns/common/lang-hu.rme
diff --git a/tex/context/patterns/lang-is.rme b/tex/context/patterns/common/lang-is.rme
index c27af20b2..c27af20b2 100644
--- a/tex/context/patterns/lang-is.rme
+++ b/tex/context/patterns/common/lang-is.rme
diff --git a/tex/context/patterns/lang-it.rme b/tex/context/patterns/common/lang-it.rme
index 43c22bca8..43c22bca8 100644
--- a/tex/context/patterns/lang-it.rme
+++ b/tex/context/patterns/common/lang-it.rme
diff --git a/tex/context/patterns/lang-la.rme b/tex/context/patterns/common/lang-la.rme
index 55c3af830..55c3af830 100644
--- a/tex/context/patterns/lang-la.rme
+++ b/tex/context/patterns/common/lang-la.rme
diff --git a/tex/context/patterns/lang-lt.rme b/tex/context/patterns/common/lang-lt.rme
index 277c80741..277c80741 100644
--- a/tex/context/patterns/lang-lt.rme
+++ b/tex/context/patterns/common/lang-lt.rme
diff --git a/tex/context/patterns/lang-lv.rme b/tex/context/patterns/common/lang-lv.rme
index a473a582a..a473a582a 100644
--- a/tex/context/patterns/lang-lv.rme
+++ b/tex/context/patterns/common/lang-lv.rme
diff --git a/tex/context/patterns/lang-ml.rme b/tex/context/patterns/common/lang-ml.rme
index 4fa574fe0..4fa574fe0 100644
--- a/tex/context/patterns/lang-ml.rme
+++ b/tex/context/patterns/common/lang-ml.rme
diff --git a/tex/context/patterns/lang-mn.rme b/tex/context/patterns/common/lang-mn.rme
index ee55f6b39..ee55f6b39 100644
--- a/tex/context/patterns/lang-mn.rme
+++ b/tex/context/patterns/common/lang-mn.rme
diff --git a/tex/context/patterns/lang-nb.rme b/tex/context/patterns/common/lang-nb.rme
index db6d41859..db6d41859 100644
--- a/tex/context/patterns/lang-nb.rme
+++ b/tex/context/patterns/common/lang-nb.rme
diff --git a/tex/context/patterns/lang-nl.rme b/tex/context/patterns/common/lang-nl.rme
index 1e5c251d8..1e5c251d8 100644
--- a/tex/context/patterns/lang-nl.rme
+++ b/tex/context/patterns/common/lang-nl.rme
diff --git a/tex/context/patterns/lang-nn.rme b/tex/context/patterns/common/lang-nn.rme
index cdb8fee43..cdb8fee43 100644
--- a/tex/context/patterns/lang-nn.rme
+++ b/tex/context/patterns/common/lang-nn.rme
diff --git a/tex/context/patterns/lang-pl.rme b/tex/context/patterns/common/lang-pl.rme
index b339250c8..b339250c8 100644
--- a/tex/context/patterns/lang-pl.rme
+++ b/tex/context/patterns/common/lang-pl.rme
diff --git a/tex/context/patterns/lang-pt.rme b/tex/context/patterns/common/lang-pt.rme
index 145786864..145786864 100644
--- a/tex/context/patterns/lang-pt.rme
+++ b/tex/context/patterns/common/lang-pt.rme
diff --git a/tex/context/patterns/lang-ro.rme b/tex/context/patterns/common/lang-ro.rme
index a484dcb80..a484dcb80 100644
--- a/tex/context/patterns/lang-ro.rme
+++ b/tex/context/patterns/common/lang-ro.rme
diff --git a/tex/context/patterns/lang-ru.rme b/tex/context/patterns/common/lang-ru.rme
index fc796dca1..fc796dca1 100644
--- a/tex/context/patterns/lang-ru.rme
+++ b/tex/context/patterns/common/lang-ru.rme
diff --git a/tex/context/patterns/lang-sk.rme b/tex/context/patterns/common/lang-sk.rme
index 380feaf36..380feaf36 100644
--- a/tex/context/patterns/lang-sk.rme
+++ b/tex/context/patterns/common/lang-sk.rme
diff --git a/tex/context/patterns/lang-sl.rme b/tex/context/patterns/common/lang-sl.rme
index 63a43b508..63a43b508 100644
--- a/tex/context/patterns/lang-sl.rme
+++ b/tex/context/patterns/common/lang-sl.rme
diff --git a/tex/context/patterns/lang-sr.rme b/tex/context/patterns/common/lang-sr.rme
index f163cc8a9..f163cc8a9 100644
--- a/tex/context/patterns/lang-sr.rme
+++ b/tex/context/patterns/common/lang-sr.rme
diff --git a/tex/context/patterns/lang-sv.rme b/tex/context/patterns/common/lang-sv.rme
index 1339b764f..1339b764f 100644
--- a/tex/context/patterns/lang-sv.rme
+++ b/tex/context/patterns/common/lang-sv.rme
diff --git a/tex/context/patterns/lang-th.rme b/tex/context/patterns/common/lang-th.rme
index 8e61b9468..8e61b9468 100644
--- a/tex/context/patterns/lang-th.rme
+++ b/tex/context/patterns/common/lang-th.rme
diff --git a/tex/context/patterns/lang-tk.rme b/tex/context/patterns/common/lang-tk.rme
index 5f132a2cf..5f132a2cf 100644
--- a/tex/context/patterns/lang-tk.rme
+++ b/tex/context/patterns/common/lang-tk.rme
diff --git a/tex/context/patterns/lang-tr.rme b/tex/context/patterns/common/lang-tr.rme
index e4f35031f..e4f35031f 100644
--- a/tex/context/patterns/lang-tr.rme
+++ b/tex/context/patterns/common/lang-tr.rme
diff --git a/tex/context/patterns/lang-uk.rme b/tex/context/patterns/common/lang-uk.rme
index b3e047fda..b3e047fda 100644
--- a/tex/context/patterns/lang-uk.rme
+++ b/tex/context/patterns/common/lang-uk.rme
diff --git a/tex/context/patterns/lang-us.rme b/tex/context/patterns/common/lang-us.rme
index c38a74635..c38a74635 100644
--- a/tex/context/patterns/lang-us.rme
+++ b/tex/context/patterns/common/lang-us.rme
diff --git a/tex/context/patterns/lang-zh.rme b/tex/context/patterns/common/lang-zh.rme
index 3b98beae2..3b98beae2 100644
--- a/tex/context/patterns/lang-zh.rme
+++ b/tex/context/patterns/common/lang-zh.rme
diff --git a/tex/context/patterns/lang-af.hyp b/tex/context/patterns/mkii/lang-af.hyp
index b7a8ed85d..b7a8ed85d 100644
--- a/tex/context/patterns/lang-af.hyp
+++ b/tex/context/patterns/mkii/lang-af.hyp
diff --git a/tex/context/patterns/lang-af.pat b/tex/context/patterns/mkii/lang-af.pat
index a34c451cc..a34c451cc 100644
--- a/tex/context/patterns/lang-af.pat
+++ b/tex/context/patterns/mkii/lang-af.pat
diff --git a/tex/context/patterns/lang-agr.hyp b/tex/context/patterns/mkii/lang-agr.hyp
index 16a2cc279..16a2cc279 100644
--- a/tex/context/patterns/lang-agr.hyp
+++ b/tex/context/patterns/mkii/lang-agr.hyp
diff --git a/tex/context/patterns/lang-agr.pat b/tex/context/patterns/mkii/lang-agr.pat
index 521cdf3b6..521cdf3b6 100644
--- a/tex/context/patterns/lang-agr.pat
+++ b/tex/context/patterns/mkii/lang-agr.pat
diff --git a/tex/context/patterns/lang-ala.hyp b/tex/context/patterns/mkii/lang-ala.hyp
index edeef6039..edeef6039 100644
--- a/tex/context/patterns/lang-ala.hyp
+++ b/tex/context/patterns/mkii/lang-ala.hyp
diff --git a/tex/context/patterns/lang-ala.pat b/tex/context/patterns/mkii/lang-ala.pat
index 772b8be81..772b8be81 100644
--- a/tex/context/patterns/lang-ala.pat
+++ b/tex/context/patterns/mkii/lang-ala.pat
diff --git a/tex/context/patterns/lang-bg.hyp b/tex/context/patterns/mkii/lang-bg.hyp
index 35eb1c35d..35eb1c35d 100644
--- a/tex/context/patterns/lang-bg.hyp
+++ b/tex/context/patterns/mkii/lang-bg.hyp
diff --git a/tex/context/patterns/lang-bg.pat b/tex/context/patterns/mkii/lang-bg.pat
index 2a0a8a0f1..2a0a8a0f1 100644
--- a/tex/context/patterns/lang-bg.pat
+++ b/tex/context/patterns/mkii/lang-bg.pat
diff --git a/tex/context/patterns/lang-ca.hyp b/tex/context/patterns/mkii/lang-ca.hyp
index db408fc29..db408fc29 100644
--- a/tex/context/patterns/lang-ca.hyp
+++ b/tex/context/patterns/mkii/lang-ca.hyp
diff --git a/tex/context/patterns/lang-ca.pat b/tex/context/patterns/mkii/lang-ca.pat
index ec5a4b4ee..ec5a4b4ee 100644
--- a/tex/context/patterns/lang-ca.pat
+++ b/tex/context/patterns/mkii/lang-ca.pat
diff --git a/tex/context/patterns/lang-cs.hyp b/tex/context/patterns/mkii/lang-cs.hyp
index 1739a8d8b..1739a8d8b 100644
--- a/tex/context/patterns/lang-cs.hyp
+++ b/tex/context/patterns/mkii/lang-cs.hyp
diff --git a/tex/context/patterns/lang-cs.pat b/tex/context/patterns/mkii/lang-cs.pat
index 726a9e7d2..726a9e7d2 100644
--- a/tex/context/patterns/lang-cs.pat
+++ b/tex/context/patterns/mkii/lang-cs.pat
diff --git a/tex/context/patterns/lang-cy.hyp b/tex/context/patterns/mkii/lang-cy.hyp
index 94cbe56cc..94cbe56cc 100644
--- a/tex/context/patterns/lang-cy.hyp
+++ b/tex/context/patterns/mkii/lang-cy.hyp
diff --git a/tex/context/patterns/lang-cy.pat b/tex/context/patterns/mkii/lang-cy.pat
index 508ee566f..508ee566f 100644
--- a/tex/context/patterns/lang-cy.pat
+++ b/tex/context/patterns/mkii/lang-cy.pat
diff --git a/tex/context/patterns/lang-da.hyp b/tex/context/patterns/mkii/lang-da.hyp
index b288255a8..b288255a8 100644
--- a/tex/context/patterns/lang-da.hyp
+++ b/tex/context/patterns/mkii/lang-da.hyp
diff --git a/tex/context/patterns/lang-da.pat b/tex/context/patterns/mkii/lang-da.pat
index 5774f667c..5774f667c 100644
--- a/tex/context/patterns/lang-da.pat
+++ b/tex/context/patterns/mkii/lang-da.pat
diff --git a/tex/context/patterns/lang-de.hyp b/tex/context/patterns/mkii/lang-de.hyp
index f69d6dcb1..f69d6dcb1 100644
--- a/tex/context/patterns/lang-de.hyp
+++ b/tex/context/patterns/mkii/lang-de.hyp
diff --git a/tex/context/patterns/lang-de.pat b/tex/context/patterns/mkii/lang-de.pat
index a5e2e1633..a5e2e1633 100644
--- a/tex/context/patterns/lang-de.pat
+++ b/tex/context/patterns/mkii/lang-de.pat
diff --git a/tex/context/patterns/lang-deo.hyp b/tex/context/patterns/mkii/lang-deo.hyp
index 081342a1d..081342a1d 100644
--- a/tex/context/patterns/lang-deo.hyp
+++ b/tex/context/patterns/mkii/lang-deo.hyp
diff --git a/tex/context/patterns/lang-deo.pat b/tex/context/patterns/mkii/lang-deo.pat
index ef5ac5c4d..ef5ac5c4d 100644
--- a/tex/context/patterns/lang-deo.pat
+++ b/tex/context/patterns/mkii/lang-deo.pat
diff --git a/tex/context/patterns/lang-es.hyp b/tex/context/patterns/mkii/lang-es.hyp
index 5263fdd82..5263fdd82 100644
--- a/tex/context/patterns/lang-es.hyp
+++ b/tex/context/patterns/mkii/lang-es.hyp
diff --git a/tex/context/patterns/lang-es.pat b/tex/context/patterns/mkii/lang-es.pat
index 55e09b49e..55e09b49e 100644
--- a/tex/context/patterns/lang-es.pat
+++ b/tex/context/patterns/mkii/lang-es.pat
diff --git a/tex/context/patterns/lang-et.hyp b/tex/context/patterns/mkii/lang-et.hyp
index 33a2c2439..33a2c2439 100644
--- a/tex/context/patterns/lang-et.hyp
+++ b/tex/context/patterns/mkii/lang-et.hyp
diff --git a/tex/context/patterns/lang-et.pat b/tex/context/patterns/mkii/lang-et.pat
index 024e7610d..024e7610d 100644
--- a/tex/context/patterns/lang-et.pat
+++ b/tex/context/patterns/mkii/lang-et.pat
diff --git a/tex/context/patterns/lang-eu.hyp b/tex/context/patterns/mkii/lang-eu.hyp
index 85f620e90..85f620e90 100644
--- a/tex/context/patterns/lang-eu.hyp
+++ b/tex/context/patterns/mkii/lang-eu.hyp
diff --git a/tex/context/patterns/lang-eu.pat b/tex/context/patterns/mkii/lang-eu.pat
index 77f1f4803..77f1f4803 100644
--- a/tex/context/patterns/lang-eu.pat
+++ b/tex/context/patterns/mkii/lang-eu.pat
diff --git a/tex/context/patterns/lang-fi.hyp b/tex/context/patterns/mkii/lang-fi.hyp
index 944dbd7a8..944dbd7a8 100644
--- a/tex/context/patterns/lang-fi.hyp
+++ b/tex/context/patterns/mkii/lang-fi.hyp
diff --git a/tex/context/patterns/lang-fi.pat b/tex/context/patterns/mkii/lang-fi.pat
index a2b4dad7c..a2b4dad7c 100644
--- a/tex/context/patterns/lang-fi.pat
+++ b/tex/context/patterns/mkii/lang-fi.pat
diff --git a/tex/context/patterns/lang-fr.hyp b/tex/context/patterns/mkii/lang-fr.hyp
index 715889832..715889832 100644
--- a/tex/context/patterns/lang-fr.hyp
+++ b/tex/context/patterns/mkii/lang-fr.hyp
diff --git a/tex/context/patterns/lang-fr.pat b/tex/context/patterns/mkii/lang-fr.pat
index 540785c6e..540785c6e 100644
--- a/tex/context/patterns/lang-fr.pat
+++ b/tex/context/patterns/mkii/lang-fr.pat
diff --git a/tex/context/patterns/lang-gb.hyp b/tex/context/patterns/mkii/lang-gb.hyp
index 8d98f2de4..8d98f2de4 100644
--- a/tex/context/patterns/lang-gb.hyp
+++ b/tex/context/patterns/mkii/lang-gb.hyp
diff --git a/tex/context/patterns/lang-gb.pat b/tex/context/patterns/mkii/lang-gb.pat
index 7aee4ea65..7aee4ea65 100644
--- a/tex/context/patterns/lang-gb.pat
+++ b/tex/context/patterns/mkii/lang-gb.pat
diff --git a/tex/context/patterns/lang-hr.hyp b/tex/context/patterns/mkii/lang-hr.hyp
index 4491ccb47..4491ccb47 100644
--- a/tex/context/patterns/lang-hr.hyp
+++ b/tex/context/patterns/mkii/lang-hr.hyp
diff --git a/tex/context/patterns/lang-hr.pat b/tex/context/patterns/mkii/lang-hr.pat
index 9c8401605..9c8401605 100644
--- a/tex/context/patterns/lang-hr.pat
+++ b/tex/context/patterns/mkii/lang-hr.pat
diff --git a/tex/context/patterns/lang-hu.hyp b/tex/context/patterns/mkii/lang-hu.hyp
index 8161b0836..8161b0836 100644
--- a/tex/context/patterns/lang-hu.hyp
+++ b/tex/context/patterns/mkii/lang-hu.hyp
diff --git a/tex/context/patterns/lang-hu.pat b/tex/context/patterns/mkii/lang-hu.pat
index 1efa981e0..1efa981e0 100644
--- a/tex/context/patterns/lang-hu.pat
+++ b/tex/context/patterns/mkii/lang-hu.pat
diff --git a/tex/context/patterns/lang-is.hyp b/tex/context/patterns/mkii/lang-is.hyp
index fbb10dc85..fbb10dc85 100644
--- a/tex/context/patterns/lang-is.hyp
+++ b/tex/context/patterns/mkii/lang-is.hyp
diff --git a/tex/context/patterns/lang-is.pat b/tex/context/patterns/mkii/lang-is.pat
index e365f7072..e365f7072 100644
--- a/tex/context/patterns/lang-is.pat
+++ b/tex/context/patterns/mkii/lang-is.pat
diff --git a/tex/context/patterns/lang-it.hyp b/tex/context/patterns/mkii/lang-it.hyp
index f9877a6ec..f9877a6ec 100644
--- a/tex/context/patterns/lang-it.hyp
+++ b/tex/context/patterns/mkii/lang-it.hyp
diff --git a/tex/context/patterns/lang-it.pat b/tex/context/patterns/mkii/lang-it.pat
index 12a9edf33..12a9edf33 100644
--- a/tex/context/patterns/lang-it.pat
+++ b/tex/context/patterns/mkii/lang-it.pat
diff --git a/tex/context/patterns/lang-la.hyp b/tex/context/patterns/mkii/lang-la.hyp
index 266c3333b..266c3333b 100644
--- a/tex/context/patterns/lang-la.hyp
+++ b/tex/context/patterns/mkii/lang-la.hyp
diff --git a/tex/context/patterns/lang-la.pat b/tex/context/patterns/mkii/lang-la.pat
index e6cabb9dc..e6cabb9dc 100644
--- a/tex/context/patterns/lang-la.pat
+++ b/tex/context/patterns/mkii/lang-la.pat
diff --git a/tex/context/patterns/lang-lt.hyp b/tex/context/patterns/mkii/lang-lt.hyp
index 1d7dd564a..1d7dd564a 100644
--- a/tex/context/patterns/lang-lt.hyp
+++ b/tex/context/patterns/mkii/lang-lt.hyp
diff --git a/tex/context/patterns/lang-lt.pat b/tex/context/patterns/mkii/lang-lt.pat
index 41474fa29..41474fa29 100644
--- a/tex/context/patterns/lang-lt.pat
+++ b/tex/context/patterns/mkii/lang-lt.pat
diff --git a/tex/context/patterns/lang-lv.hyp b/tex/context/patterns/mkii/lang-lv.hyp
index 2f1f4b0b1..2f1f4b0b1 100644
--- a/tex/context/patterns/lang-lv.hyp
+++ b/tex/context/patterns/mkii/lang-lv.hyp
diff --git a/tex/context/patterns/lang-lv.pat b/tex/context/patterns/mkii/lang-lv.pat
index 8fffdc8cd..8fffdc8cd 100644
--- a/tex/context/patterns/lang-lv.pat
+++ b/tex/context/patterns/mkii/lang-lv.pat
diff --git a/tex/context/patterns/lang-ml.hyp b/tex/context/patterns/mkii/lang-ml.hyp
index 7dba49173..7dba49173 100644
--- a/tex/context/patterns/lang-ml.hyp
+++ b/tex/context/patterns/mkii/lang-ml.hyp
diff --git a/tex/context/patterns/lang-ml.pat b/tex/context/patterns/mkii/lang-ml.pat
index b53251a69..b53251a69 100644
--- a/tex/context/patterns/lang-ml.pat
+++ b/tex/context/patterns/mkii/lang-ml.pat
diff --git a/tex/context/patterns/lang-mn.hyp b/tex/context/patterns/mkii/lang-mn.hyp
index f81ec6e5f..f81ec6e5f 100644
--- a/tex/context/patterns/lang-mn.hyp
+++ b/tex/context/patterns/mkii/lang-mn.hyp
diff --git a/tex/context/patterns/lang-mn.pat b/tex/context/patterns/mkii/lang-mn.pat
index 48a6b9577..48a6b9577 100644
--- a/tex/context/patterns/lang-mn.pat
+++ b/tex/context/patterns/mkii/lang-mn.pat
diff --git a/tex/context/patterns/lang-nb.hyp b/tex/context/patterns/mkii/lang-nb.hyp
index 85bd4f8e1..85bd4f8e1 100644
--- a/tex/context/patterns/lang-nb.hyp
+++ b/tex/context/patterns/mkii/lang-nb.hyp
diff --git a/tex/context/patterns/lang-nb.pat b/tex/context/patterns/mkii/lang-nb.pat
index ea562eebd..ea562eebd 100644
--- a/tex/context/patterns/lang-nb.pat
+++ b/tex/context/patterns/mkii/lang-nb.pat
diff --git a/tex/context/patterns/lang-nl.hyp b/tex/context/patterns/mkii/lang-nl.hyp
index 370e03ae5..370e03ae5 100644
--- a/tex/context/patterns/lang-nl.hyp
+++ b/tex/context/patterns/mkii/lang-nl.hyp
diff --git a/tex/context/patterns/lang-nl.pat b/tex/context/patterns/mkii/lang-nl.pat
index bb0a4a86f..bb0a4a86f 100644
--- a/tex/context/patterns/lang-nl.pat
+++ b/tex/context/patterns/mkii/lang-nl.pat
diff --git a/tex/context/patterns/lang-nn.hyp b/tex/context/patterns/mkii/lang-nn.hyp
index 552576f8d..552576f8d 100644
--- a/tex/context/patterns/lang-nn.hyp
+++ b/tex/context/patterns/mkii/lang-nn.hyp
diff --git a/tex/context/patterns/lang-nn.pat b/tex/context/patterns/mkii/lang-nn.pat
index 37822ce3e..37822ce3e 100644
--- a/tex/context/patterns/lang-nn.pat
+++ b/tex/context/patterns/mkii/lang-nn.pat
diff --git a/tex/context/patterns/lang-pl.hyp b/tex/context/patterns/mkii/lang-pl.hyp
index e7c40e6d2..e7c40e6d2 100644
--- a/tex/context/patterns/lang-pl.hyp
+++ b/tex/context/patterns/mkii/lang-pl.hyp
diff --git a/tex/context/patterns/lang-pl.pat b/tex/context/patterns/mkii/lang-pl.pat
index 6934fa4b2..6934fa4b2 100644
--- a/tex/context/patterns/lang-pl.pat
+++ b/tex/context/patterns/mkii/lang-pl.pat
diff --git a/tex/context/patterns/lang-pt.hyp b/tex/context/patterns/mkii/lang-pt.hyp
index 73b3cb6e2..73b3cb6e2 100644
--- a/tex/context/patterns/lang-pt.hyp
+++ b/tex/context/patterns/mkii/lang-pt.hyp
diff --git a/tex/context/patterns/lang-pt.pat b/tex/context/patterns/mkii/lang-pt.pat
index 5a284c087..5a284c087 100644
--- a/tex/context/patterns/lang-pt.pat
+++ b/tex/context/patterns/mkii/lang-pt.pat
diff --git a/tex/context/patterns/lang-ro.hyp b/tex/context/patterns/mkii/lang-ro.hyp
index 488a4b777..488a4b777 100644
--- a/tex/context/patterns/lang-ro.hyp
+++ b/tex/context/patterns/mkii/lang-ro.hyp
diff --git a/tex/context/patterns/lang-ro.pat b/tex/context/patterns/mkii/lang-ro.pat
index bf0e71fc1..bf0e71fc1 100644
--- a/tex/context/patterns/lang-ro.pat
+++ b/tex/context/patterns/mkii/lang-ro.pat
diff --git a/tex/context/patterns/lang-ru.hyp b/tex/context/patterns/mkii/lang-ru.hyp
index 95aca29e7..95aca29e7 100644
--- a/tex/context/patterns/lang-ru.hyp
+++ b/tex/context/patterns/mkii/lang-ru.hyp
diff --git a/tex/context/patterns/lang-ru.pat b/tex/context/patterns/mkii/lang-ru.pat
index 787b95c23..787b95c23 100644
--- a/tex/context/patterns/lang-ru.pat
+++ b/tex/context/patterns/mkii/lang-ru.pat
diff --git a/tex/context/patterns/lang-sk.hyp b/tex/context/patterns/mkii/lang-sk.hyp
index fdc5005f3..fdc5005f3 100644
--- a/tex/context/patterns/lang-sk.hyp
+++ b/tex/context/patterns/mkii/lang-sk.hyp
diff --git a/tex/context/patterns/lang-sk.pat b/tex/context/patterns/mkii/lang-sk.pat
index 66d32700a..66d32700a 100644
--- a/tex/context/patterns/lang-sk.pat
+++ b/tex/context/patterns/mkii/lang-sk.pat
diff --git a/tex/context/patterns/lang-sl.hyp b/tex/context/patterns/mkii/lang-sl.hyp
index a1ebafc72..a1ebafc72 100644
--- a/tex/context/patterns/lang-sl.hyp
+++ b/tex/context/patterns/mkii/lang-sl.hyp
diff --git a/tex/context/patterns/lang-sl.pat b/tex/context/patterns/mkii/lang-sl.pat
index 67167926b..67167926b 100644
--- a/tex/context/patterns/lang-sl.pat
+++ b/tex/context/patterns/mkii/lang-sl.pat
diff --git a/tex/context/patterns/lang-sr.hyp b/tex/context/patterns/mkii/lang-sr.hyp
index 86dd41074..86dd41074 100644
--- a/tex/context/patterns/lang-sr.hyp
+++ b/tex/context/patterns/mkii/lang-sr.hyp
diff --git a/tex/context/patterns/lang-sr.pat b/tex/context/patterns/mkii/lang-sr.pat
index 8c6d8f27c..8c6d8f27c 100644
--- a/tex/context/patterns/lang-sr.pat
+++ b/tex/context/patterns/mkii/lang-sr.pat
diff --git a/tex/context/patterns/lang-sv.hyp b/tex/context/patterns/mkii/lang-sv.hyp
index 53073f6bd..53073f6bd 100644
--- a/tex/context/patterns/lang-sv.hyp
+++ b/tex/context/patterns/mkii/lang-sv.hyp
diff --git a/tex/context/patterns/lang-sv.pat b/tex/context/patterns/mkii/lang-sv.pat
index 380ca124a..380ca124a 100644
--- a/tex/context/patterns/lang-sv.pat
+++ b/tex/context/patterns/mkii/lang-sv.pat
diff --git a/tex/context/patterns/lang-th.hyp b/tex/context/patterns/mkii/lang-th.hyp
index 17a1bba15..17a1bba15 100644
--- a/tex/context/patterns/lang-th.hyp
+++ b/tex/context/patterns/mkii/lang-th.hyp
diff --git a/tex/context/patterns/lang-th.pat b/tex/context/patterns/mkii/lang-th.pat
index 5b0ad206b..5b0ad206b 100644
--- a/tex/context/patterns/lang-th.pat
+++ b/tex/context/patterns/mkii/lang-th.pat
diff --git a/tex/context/patterns/lang-tk.hyp b/tex/context/patterns/mkii/lang-tk.hyp
index 6302966fb..6302966fb 100644
--- a/tex/context/patterns/lang-tk.hyp
+++ b/tex/context/patterns/mkii/lang-tk.hyp
diff --git a/tex/context/patterns/lang-tk.pat b/tex/context/patterns/mkii/lang-tk.pat
index a5b456c74..a5b456c74 100644
--- a/tex/context/patterns/lang-tk.pat
+++ b/tex/context/patterns/mkii/lang-tk.pat
diff --git a/tex/context/patterns/lang-tr.hyp b/tex/context/patterns/mkii/lang-tr.hyp
index 89c578375..89c578375 100644
--- a/tex/context/patterns/lang-tr.hyp
+++ b/tex/context/patterns/mkii/lang-tr.hyp
diff --git a/tex/context/patterns/lang-tr.pat b/tex/context/patterns/mkii/lang-tr.pat
index 9126e54de..9126e54de 100644
--- a/tex/context/patterns/lang-tr.pat
+++ b/tex/context/patterns/mkii/lang-tr.pat
diff --git a/tex/context/patterns/lang-uk.hyp b/tex/context/patterns/mkii/lang-uk.hyp
index 97dde24dd..97dde24dd 100644
--- a/tex/context/patterns/lang-uk.hyp
+++ b/tex/context/patterns/mkii/lang-uk.hyp
diff --git a/tex/context/patterns/lang-uk.pat b/tex/context/patterns/mkii/lang-uk.pat
index 24da6a9fd..24da6a9fd 100644
--- a/tex/context/patterns/lang-uk.pat
+++ b/tex/context/patterns/mkii/lang-uk.pat
diff --git a/tex/context/patterns/lang-us.hyp b/tex/context/patterns/mkii/lang-us.hyp
index a9f901f3f..a9f901f3f 100644
--- a/tex/context/patterns/lang-us.hyp
+++ b/tex/context/patterns/mkii/lang-us.hyp
diff --git a/tex/context/patterns/lang-us.pat b/tex/context/patterns/mkii/lang-us.pat
index f4155353c..f4155353c 100644
--- a/tex/context/patterns/lang-us.pat
+++ b/tex/context/patterns/mkii/lang-us.pat
diff --git a/tex/context/patterns/lang-zh.hyp b/tex/context/patterns/mkii/lang-zh.hyp
index aa58c19c2..aa58c19c2 100644
--- a/tex/context/patterns/lang-zh.hyp
+++ b/tex/context/patterns/mkii/lang-zh.hyp
diff --git a/tex/context/patterns/lang-zh.pat b/tex/context/patterns/mkii/lang-zh.pat
index 7fde63bc0..7fde63bc0 100644
--- a/tex/context/patterns/lang-zh.pat
+++ b/tex/context/patterns/mkii/lang-zh.pat
diff --git a/tex/context/patterns/lang-af.lua b/tex/context/patterns/mkiv/lang-af.lua
index 31becd0ba..31becd0ba 100644
--- a/tex/context/patterns/lang-af.lua
+++ b/tex/context/patterns/mkiv/lang-af.lua
diff --git a/tex/context/patterns/lang-agr.lua b/tex/context/patterns/mkiv/lang-agr.lua
index 976965f33..976965f33 100644
--- a/tex/context/patterns/lang-agr.lua
+++ b/tex/context/patterns/mkiv/lang-agr.lua
diff --git a/tex/context/patterns/lang-ala.lua b/tex/context/patterns/mkiv/lang-ala.lua
index 5076c2bc7..5076c2bc7 100644
--- a/tex/context/patterns/lang-ala.lua
+++ b/tex/context/patterns/mkiv/lang-ala.lua
diff --git a/tex/context/patterns/lang-bg.lua b/tex/context/patterns/mkiv/lang-bg.lua
index e6b8bb7e0..e6b8bb7e0 100644
--- a/tex/context/patterns/lang-bg.lua
+++ b/tex/context/patterns/mkiv/lang-bg.lua
diff --git a/tex/context/patterns/lang-ca.lua b/tex/context/patterns/mkiv/lang-ca.lua
index 7172fd88f..7172fd88f 100644
--- a/tex/context/patterns/lang-ca.lua
+++ b/tex/context/patterns/mkiv/lang-ca.lua
diff --git a/tex/context/patterns/lang-cs.lua b/tex/context/patterns/mkiv/lang-cs.lua
index 67b7595c6..67b7595c6 100644
--- a/tex/context/patterns/lang-cs.lua
+++ b/tex/context/patterns/mkiv/lang-cs.lua
diff --git a/tex/context/patterns/lang-cy.lua b/tex/context/patterns/mkiv/lang-cy.lua
index ded965fbb..ded965fbb 100644
--- a/tex/context/patterns/lang-cy.lua
+++ b/tex/context/patterns/mkiv/lang-cy.lua
diff --git a/tex/context/patterns/lang-da.lua b/tex/context/patterns/mkiv/lang-da.lua
index 553892070..553892070 100644
--- a/tex/context/patterns/lang-da.lua
+++ b/tex/context/patterns/mkiv/lang-da.lua
diff --git a/tex/context/patterns/lang-de.lua b/tex/context/patterns/mkiv/lang-de.lua
index 340d768a3..340d768a3 100644
--- a/tex/context/patterns/lang-de.lua
+++ b/tex/context/patterns/mkiv/lang-de.lua
diff --git a/tex/context/patterns/lang-deo.lua b/tex/context/patterns/mkiv/lang-deo.lua
index 1d353a6d0..1d353a6d0 100644
--- a/tex/context/patterns/lang-deo.lua
+++ b/tex/context/patterns/mkiv/lang-deo.lua
diff --git a/tex/context/patterns/lang-es.lua b/tex/context/patterns/mkiv/lang-es.lua
index 9d6bbf069..9d6bbf069 100644
--- a/tex/context/patterns/lang-es.lua
+++ b/tex/context/patterns/mkiv/lang-es.lua
diff --git a/tex/context/patterns/lang-et.lua b/tex/context/patterns/mkiv/lang-et.lua
index 9f1f1fe6e..9f1f1fe6e 100644
--- a/tex/context/patterns/lang-et.lua
+++ b/tex/context/patterns/mkiv/lang-et.lua
diff --git a/tex/context/patterns/lang-eu.lua b/tex/context/patterns/mkiv/lang-eu.lua
index c6e4893c7..c6e4893c7 100644
--- a/tex/context/patterns/lang-eu.lua
+++ b/tex/context/patterns/mkiv/lang-eu.lua
diff --git a/tex/context/patterns/lang-fi.lua b/tex/context/patterns/mkiv/lang-fi.lua
index cebbd7584..cebbd7584 100644
--- a/tex/context/patterns/lang-fi.lua
+++ b/tex/context/patterns/mkiv/lang-fi.lua
diff --git a/tex/context/patterns/lang-fr.lua b/tex/context/patterns/mkiv/lang-fr.lua
index 1a9cf95c3..1a9cf95c3 100644
--- a/tex/context/patterns/lang-fr.lua
+++ b/tex/context/patterns/mkiv/lang-fr.lua
diff --git a/tex/context/patterns/lang-gb.lua b/tex/context/patterns/mkiv/lang-gb.lua
index 383deb56d..383deb56d 100644
--- a/tex/context/patterns/lang-gb.lua
+++ b/tex/context/patterns/mkiv/lang-gb.lua
diff --git a/tex/context/patterns/lang-hr.lua b/tex/context/patterns/mkiv/lang-hr.lua
index 11d0c22ca..11d0c22ca 100644
--- a/tex/context/patterns/lang-hr.lua
+++ b/tex/context/patterns/mkiv/lang-hr.lua
diff --git a/tex/context/patterns/lang-hu.lua b/tex/context/patterns/mkiv/lang-hu.lua
index 22971f04e..22971f04e 100644
--- a/tex/context/patterns/lang-hu.lua
+++ b/tex/context/patterns/mkiv/lang-hu.lua
diff --git a/tex/context/patterns/lang-is.lua b/tex/context/patterns/mkiv/lang-is.lua
index dc150e58a..dc150e58a 100644
--- a/tex/context/patterns/lang-is.lua
+++ b/tex/context/patterns/mkiv/lang-is.lua
diff --git a/tex/context/patterns/lang-it.lua b/tex/context/patterns/mkiv/lang-it.lua
index c1ef0b5df..c1ef0b5df 100644
--- a/tex/context/patterns/lang-it.lua
+++ b/tex/context/patterns/mkiv/lang-it.lua
diff --git a/tex/context/patterns/lang-la.lua b/tex/context/patterns/mkiv/lang-la.lua
index d7c218814..d7c218814 100644
--- a/tex/context/patterns/lang-la.lua
+++ b/tex/context/patterns/mkiv/lang-la.lua
diff --git a/tex/context/patterns/lang-lt.lua b/tex/context/patterns/mkiv/lang-lt.lua
index e1998f444..e1998f444 100644
--- a/tex/context/patterns/lang-lt.lua
+++ b/tex/context/patterns/mkiv/lang-lt.lua
diff --git a/tex/context/patterns/lang-lv.lua b/tex/context/patterns/mkiv/lang-lv.lua
index d55b9be83..d55b9be83 100644
--- a/tex/context/patterns/lang-lv.lua
+++ b/tex/context/patterns/mkiv/lang-lv.lua
diff --git a/tex/context/patterns/lang-ml.lua b/tex/context/patterns/mkiv/lang-ml.lua
index 042cdf5df..042cdf5df 100644
--- a/tex/context/patterns/lang-ml.lua
+++ b/tex/context/patterns/mkiv/lang-ml.lua
diff --git a/tex/context/patterns/lang-mn.lua b/tex/context/patterns/mkiv/lang-mn.lua
index 4dae938a8..4dae938a8 100644
--- a/tex/context/patterns/lang-mn.lua
+++ b/tex/context/patterns/mkiv/lang-mn.lua
diff --git a/tex/context/patterns/lang-nb.lua b/tex/context/patterns/mkiv/lang-nb.lua
index 67845b077..67845b077 100644
--- a/tex/context/patterns/lang-nb.lua
+++ b/tex/context/patterns/mkiv/lang-nb.lua
diff --git a/tex/context/patterns/lang-nl.lua b/tex/context/patterns/mkiv/lang-nl.lua
index 2eb02bc52..2eb02bc52 100644
--- a/tex/context/patterns/lang-nl.lua
+++ b/tex/context/patterns/mkiv/lang-nl.lua
diff --git a/tex/context/patterns/lang-nn.lua b/tex/context/patterns/mkiv/lang-nn.lua
index 0e5ad3688..0e5ad3688 100644
--- a/tex/context/patterns/lang-nn.lua
+++ b/tex/context/patterns/mkiv/lang-nn.lua
diff --git a/tex/context/patterns/lang-pl.lua b/tex/context/patterns/mkiv/lang-pl.lua
index 1ccda4c97..1ccda4c97 100644
--- a/tex/context/patterns/lang-pl.lua
+++ b/tex/context/patterns/mkiv/lang-pl.lua
diff --git a/tex/context/patterns/lang-pt.lua b/tex/context/patterns/mkiv/lang-pt.lua
index ea720216e..ea720216e 100644
--- a/tex/context/patterns/lang-pt.lua
+++ b/tex/context/patterns/mkiv/lang-pt.lua
diff --git a/tex/context/patterns/lang-ro.lua b/tex/context/patterns/mkiv/lang-ro.lua
index fb84881de..fb84881de 100644
--- a/tex/context/patterns/lang-ro.lua
+++ b/tex/context/patterns/mkiv/lang-ro.lua
diff --git a/tex/context/patterns/lang-ru.lua b/tex/context/patterns/mkiv/lang-ru.lua
index 7d469ff16..7d469ff16 100644
--- a/tex/context/patterns/lang-ru.lua
+++ b/tex/context/patterns/mkiv/lang-ru.lua
diff --git a/tex/context/patterns/lang-sk.lua b/tex/context/patterns/mkiv/lang-sk.lua
index 7a1f3d260..7a1f3d260 100644
--- a/tex/context/patterns/lang-sk.lua
+++ b/tex/context/patterns/mkiv/lang-sk.lua
diff --git a/tex/context/patterns/lang-sl.lua b/tex/context/patterns/mkiv/lang-sl.lua
index 52d79dc3b..52d79dc3b 100644
--- a/tex/context/patterns/lang-sl.lua
+++ b/tex/context/patterns/mkiv/lang-sl.lua
diff --git a/tex/context/patterns/lang-sr.lua b/tex/context/patterns/mkiv/lang-sr.lua
index 4f6fa190b..4f6fa190b 100644
--- a/tex/context/patterns/lang-sr.lua
+++ b/tex/context/patterns/mkiv/lang-sr.lua
diff --git a/tex/context/patterns/lang-sv.lua b/tex/context/patterns/mkiv/lang-sv.lua
index 50e91d849..50e91d849 100644
--- a/tex/context/patterns/lang-sv.lua
+++ b/tex/context/patterns/mkiv/lang-sv.lua
diff --git a/tex/context/patterns/lang-th.lua b/tex/context/patterns/mkiv/lang-th.lua
index 6f7deea31..6f7deea31 100644
--- a/tex/context/patterns/lang-th.lua
+++ b/tex/context/patterns/mkiv/lang-th.lua
diff --git a/tex/context/patterns/lang-tk.lua b/tex/context/patterns/mkiv/lang-tk.lua
index 53e6bf61c..53e6bf61c 100644
--- a/tex/context/patterns/lang-tk.lua
+++ b/tex/context/patterns/mkiv/lang-tk.lua
diff --git a/tex/context/patterns/lang-tr.lua b/tex/context/patterns/mkiv/lang-tr.lua
index decb50a68..decb50a68 100644
--- a/tex/context/patterns/lang-tr.lua
+++ b/tex/context/patterns/mkiv/lang-tr.lua
diff --git a/tex/context/patterns/lang-uk.lua b/tex/context/patterns/mkiv/lang-uk.lua
index 79117cf00..79117cf00 100644
--- a/tex/context/patterns/lang-uk.lua
+++ b/tex/context/patterns/mkiv/lang-uk.lua
diff --git a/tex/context/patterns/lang-us.lua b/tex/context/patterns/mkiv/lang-us.lua
index 6e783f5ac..6e783f5ac 100644
--- a/tex/context/patterns/lang-us.lua
+++ b/tex/context/patterns/mkiv/lang-us.lua
diff --git a/tex/context/patterns/lang-zh.lua b/tex/context/patterns/mkiv/lang-zh.lua
index 0dac35600..0dac35600 100644
--- a/tex/context/patterns/lang-zh.lua
+++ b/tex/context/patterns/mkiv/lang-zh.lua
diff --git a/tex/context/patterns/word-xx.lua b/tex/context/patterns/mkiv/word-xx.lua
index f8b38fe75..f8b38fe75 100644
--- a/tex/context/patterns/word-xx.lua
+++ b/tex/context/patterns/mkiv/word-xx.lua
diff --git a/tex/context/sample/aesop-de.tex b/tex/context/sample/common/aesop-de.tex
index 80a41f295..80a41f295 100644
--- a/tex/context/sample/aesop-de.tex
+++ b/tex/context/sample/common/aesop-de.tex
diff --git a/tex/context/sample/bryson.tex b/tex/context/sample/common/bryson.tex
index ecda71c58..ecda71c58 100644
--- a/tex/context/sample/bryson.tex
+++ b/tex/context/sample/common/bryson.tex
diff --git a/tex/context/sample/carey.tex b/tex/context/sample/common/carey.tex
index 81dda1c21..81dda1c21 100644
--- a/tex/context/sample/carey.tex
+++ b/tex/context/sample/common/carey.tex
diff --git a/tex/context/sample/cervantes-es.tex b/tex/context/sample/common/cervantes-es.tex
index 153797023..153797023 100644
--- a/tex/context/sample/cervantes-es.tex
+++ b/tex/context/sample/common/cervantes-es.tex
diff --git a/tex/context/sample/cow-black.mps b/tex/context/sample/common/cow-black.mps
index b34e2bab8..b34e2bab8 100644
--- a/tex/context/sample/cow-black.mps
+++ b/tex/context/sample/common/cow-black.mps
diff --git a/tex/context/sample/cow-black.pdf b/tex/context/sample/common/cow-black.pdf
index cfd70839d..cfd70839d 100644
--- a/tex/context/sample/cow-black.pdf
+++ b/tex/context/sample/common/cow-black.pdf
diff --git a/tex/context/sample/cow-brown.mps b/tex/context/sample/common/cow-brown.mps
index 530a45e9a..530a45e9a 100644
--- a/tex/context/sample/cow-brown.mps
+++ b/tex/context/sample/common/cow-brown.mps
diff --git a/tex/context/sample/cow-brown.pdf b/tex/context/sample/common/cow-brown.pdf
index 5e7fa4f86..5e7fa4f86 100644
--- a/tex/context/sample/cow-brown.pdf
+++ b/tex/context/sample/common/cow-brown.pdf
diff --git a/tex/context/sample/cow.pdf b/tex/context/sample/common/cow.pdf
index 2441faf74..2441faf74 100644
--- a/tex/context/sample/cow.pdf
+++ b/tex/context/sample/common/cow.pdf
diff --git a/tex/context/sample/d-res-01.xml b/tex/context/sample/common/d-res-01.xml
index 23f22cc32..23f22cc32 100644
--- a/tex/context/sample/d-res-01.xml
+++ b/tex/context/sample/common/d-res-01.xml
diff --git a/tex/context/sample/darwin.tex b/tex/context/sample/common/darwin.tex
index 6425bf156..6425bf156 100644
--- a/tex/context/sample/darwin.tex
+++ b/tex/context/sample/common/darwin.tex
diff --git a/tex/context/sample/davis.tex b/tex/context/sample/common/davis.tex
index 8d45c9849..8d45c9849 100644
--- a/tex/context/sample/davis.tex
+++ b/tex/context/sample/common/davis.tex
diff --git a/tex/context/sample/dawkins.tex b/tex/context/sample/common/dawkins.tex
index c0acd3157..c0acd3157 100644
--- a/tex/context/sample/dawkins.tex
+++ b/tex/context/sample/common/dawkins.tex
diff --git a/tex/context/sample/demo-mps.tex b/tex/context/sample/common/demo-mps.tex
index 57bb690c0..57bb690c0 100644
--- a/tex/context/sample/demo-mps.tex
+++ b/tex/context/sample/common/demo-mps.tex
diff --git a/tex/context/sample/demo-tex.tex b/tex/context/sample/common/demo-tex.tex
index 309a0acfc..309a0acfc 100644
--- a/tex/context/sample/demo-tex.tex
+++ b/tex/context/sample/common/demo-tex.tex
diff --git a/tex/context/sample/demo-xml.tex b/tex/context/sample/common/demo-xml.tex
index bf527a747..bf527a747 100644
--- a/tex/context/sample/demo-xml.tex
+++ b/tex/context/sample/common/demo-xml.tex
diff --git a/tex/context/sample/douglas.tex b/tex/context/sample/common/douglas.tex
index 838c6d24d..838c6d24d 100644
--- a/tex/context/sample/douglas.tex
+++ b/tex/context/sample/common/douglas.tex
diff --git a/tex/context/sample/hacker.jpg b/tex/context/sample/common/hacker.jpg
index cbc53a7de..cbc53a7de 100644
--- a/tex/context/sample/hacker.jpg
+++ b/tex/context/sample/common/hacker.jpg
diff --git a/tex/context/sample/hawking.tex b/tex/context/sample/common/hawking.tex
index e0e0cccd2..e0e0cccd2 100644
--- a/tex/context/sample/hawking.tex
+++ b/tex/context/sample/common/hawking.tex
diff --git a/tex/context/sample/khatt-ar.tex b/tex/context/sample/common/khatt-ar.tex
index c91426411..c91426411 100644
--- a/tex/context/sample/khatt-ar.tex
+++ b/tex/context/sample/common/khatt-ar.tex
diff --git a/tex/context/sample/khatt-en.tex b/tex/context/sample/common/khatt-en.tex
index f994513e7..f994513e7 100644
--- a/tex/context/sample/khatt-en.tex
+++ b/tex/context/sample/common/khatt-en.tex
diff --git a/tex/context/sample/knuth.tex b/tex/context/sample/common/knuth.tex
index 30b6310cc..30b6310cc 100644
--- a/tex/context/sample/knuth.tex
+++ b/tex/context/sample/common/knuth.tex
diff --git a/tex/context/sample/linden.tex b/tex/context/sample/common/linden.tex
index 9aaccc5e9..9aaccc5e9 100644
--- a/tex/context/sample/linden.tex
+++ b/tex/context/sample/common/linden.tex
diff --git a/tex/context/sample/lorem.tex b/tex/context/sample/common/lorem.tex
index 0132f659f..0132f659f 100644
--- a/tex/context/sample/lorem.tex
+++ b/tex/context/sample/common/lorem.tex
diff --git a/tex/context/sample/materie.tex b/tex/context/sample/common/materie.tex
index 5e2597186..5e2597186 100644
--- a/tex/context/sample/materie.tex
+++ b/tex/context/sample/common/materie.tex
diff --git a/tex/context/sample/mill.png b/tex/context/sample/common/mill.png
index 9a1bf14e8..9a1bf14e8 100644
--- a/tex/context/sample/mill.png
+++ b/tex/context/sample/common/mill.png
diff --git a/tex/context/sample/montgomery.tex b/tex/context/sample/common/montgomery.tex
index a38357ea4..a38357ea4 100644
--- a/tex/context/sample/montgomery.tex
+++ b/tex/context/sample/common/montgomery.tex
diff --git a/tex/context/sample/quevedo-es.tex b/tex/context/sample/common/quevedo-es.tex
index 166b0328f..166b0328f 100644
--- a/tex/context/sample/quevedo-es.tex
+++ b/tex/context/sample/common/quevedo-es.tex
diff --git a/tex/context/sample/reich.tex b/tex/context/sample/common/reich.tex
index db9d4404f..db9d4404f 100644
--- a/tex/context/sample/reich.tex
+++ b/tex/context/sample/common/reich.tex
diff --git a/tex/context/sample/sample.tex b/tex/context/sample/common/sample.tex
index ef31153a1..ef31153a1 100644
--- a/tex/context/sample/sample.tex
+++ b/tex/context/sample/common/sample.tex
diff --git a/tex/context/sample/samples.bib b/tex/context/sample/common/samples.bib
index e54092aae..e54092aae 100644
--- a/tex/context/sample/samples.bib
+++ b/tex/context/sample/common/samples.bib
diff --git a/tex/context/sample/samples.tex b/tex/context/sample/common/samples.tex
index 0201ab318..0201ab318 100644
--- a/tex/context/sample/samples.tex
+++ b/tex/context/sample/common/samples.tex
diff --git a/tex/context/sample/spider.eps b/tex/context/sample/common/spider.eps
index ecaafb847..ecaafb847 100644
--- a/tex/context/sample/spider.eps
+++ b/tex/context/sample/common/spider.eps
diff --git a/tex/context/sample/thuan.tex b/tex/context/sample/common/thuan.tex
index e38c58489..e38c58489 100644
--- a/tex/context/sample/thuan.tex
+++ b/tex/context/sample/common/thuan.tex
diff --git a/tex/context/sample/tufte.tex b/tex/context/sample/common/tufte.tex
index 1b54d2780..1b54d2780 100644
--- a/tex/context/sample/tufte.tex
+++ b/tex/context/sample/common/tufte.tex
diff --git a/tex/context/sample/waltham.tex b/tex/context/sample/common/waltham.tex
index 09bb8839d..09bb8839d 100644
--- a/tex/context/sample/waltham.tex
+++ b/tex/context/sample/common/waltham.tex
diff --git a/tex/context/sample/ward.tex b/tex/context/sample/common/ward.tex
index f73b62a58..f73b62a58 100644
--- a/tex/context/sample/ward.tex
+++ b/tex/context/sample/common/ward.tex
diff --git a/tex/context/sample/weisman.tex b/tex/context/sample/common/weisman.tex
index 7526d407a..7526d407a 100644
--- a/tex/context/sample/weisman.tex
+++ b/tex/context/sample/common/weisman.tex
diff --git a/tex/context/sample/zapf.tex b/tex/context/sample/common/zapf.tex
index 4029ec6ce..4029ec6ce 100644
--- a/tex/context/sample/zapf.tex
+++ b/tex/context/sample/common/zapf.tex
diff --git a/tex/context/test/context-test.tex b/tex/context/test/mkiv/context-test.tex
index 3cf002baf..3cf002baf 100644
--- a/tex/context/test/context-test.tex
+++ b/tex/context/test/mkiv/context-test.tex
diff --git a/tex/context/test/pdf-a1a-2005.mkiv b/tex/context/test/mkiv/pdf-a1a-2005.mkiv
index 8f79d3f33..8f79d3f33 100644
--- a/tex/context/test/pdf-a1a-2005.mkiv
+++ b/tex/context/test/mkiv/pdf-a1a-2005.mkiv
diff --git a/tex/context/test/pdf-a1b-2005.mkiv b/tex/context/test/mkiv/pdf-a1b-2005.mkiv
index bc970c3f9..bc970c3f9 100644
--- a/tex/context/test/pdf-a1b-2005.mkiv
+++ b/tex/context/test/mkiv/pdf-a1b-2005.mkiv
diff --git a/tex/context/test/pdf-ua.mkiv b/tex/context/test/mkiv/pdf-ua.mkiv
index e048b9717..e048b9717 100644
--- a/tex/context/test/pdf-ua.mkiv
+++ b/tex/context/test/mkiv/pdf-ua.mkiv
diff --git a/tex/context/test/pdf-x-common.mkiv b/tex/context/test/mkiv/pdf-x-common.mkiv
index 463a60e71..463a60e71 100644
--- a/tex/context/test/pdf-x-common.mkiv
+++ b/tex/context/test/mkiv/pdf-x-common.mkiv
diff --git a/tex/context/test/pdf-x1a-2001.mkiv b/tex/context/test/mkiv/pdf-x1a-2001.mkiv
index f1c5ef531..f1c5ef531 100644
--- a/tex/context/test/pdf-x1a-2001.mkiv
+++ b/tex/context/test/mkiv/pdf-x1a-2001.mkiv
diff --git a/tex/context/test/pdf-x1a-2003.mkiv b/tex/context/test/mkiv/pdf-x1a-2003.mkiv
index 7fbec5acb..7fbec5acb 100644
--- a/tex/context/test/pdf-x1a-2003.mkiv
+++ b/tex/context/test/mkiv/pdf-x1a-2003.mkiv
diff --git a/tex/context/test/pdf-x3-2002.mkiv b/tex/context/test/mkiv/pdf-x3-2002.mkiv
index be757212e..be757212e 100644
--- a/tex/context/test/pdf-x3-2002.mkiv
+++ b/tex/context/test/mkiv/pdf-x3-2002.mkiv
diff --git a/tex/context/test/pdf-x3-2003.mkiv b/tex/context/test/mkiv/pdf-x3-2003.mkiv
index cbebe1033..cbebe1033 100644
--- a/tex/context/test/pdf-x3-2003.mkiv
+++ b/tex/context/test/mkiv/pdf-x3-2003.mkiv
diff --git a/tex/context/test/pdf-x4.mkiv b/tex/context/test/mkiv/pdf-x4.mkiv
index 062de3b34..062de3b34 100644
--- a/tex/context/test/pdf-x4.mkiv
+++ b/tex/context/test/mkiv/pdf-x4.mkiv
diff --git a/tex/context/test/pdf-x4p.mkiv b/tex/context/test/mkiv/pdf-x4p.mkiv
index bfee0b238..bfee0b238 100644
--- a/tex/context/test/pdf-x4p.mkiv
+++ b/tex/context/test/mkiv/pdf-x4p.mkiv
diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/mkii/cont-sys.rme
index fa438a78d..fa438a78d 100644
--- a/tex/context/user/cont-sys.rme
+++ b/tex/context/user/mkii/cont-sys.rme
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b135c44b4..a978f455d 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  : 01/08/16 19:09:31
+-- merge date  : 01/12/16 16:24:09
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/tex/generic/context/luatex/luatex-pdf.tex b/tex/generic/context/luatex/luatex-pdf.tex
index 3fe5c2313..c48a0336b 100644
--- a/tex/generic/context/luatex/luatex-pdf.tex
+++ b/tex/generic/context/luatex/luatex-pdf.tex
@@ -132,6 +132,7 @@
     \xdef\pdflinkmargin               {\pdfvariable linkmargin}
     \xdef\pdfdestmargin               {\pdfvariable destmargin}
     \xdef\pdfthreadmargin             {\pdfvariable threadmargin}
+  % \xdef\pdfxformmargin              {\pdfvariable xformmargin}
 
     \xdef\pdfpagesattr                {\pdfvariable pagesattr}
     \xdef\pdfpageattr                 {\pdfvariable pageattr}
diff --git a/tex/latex/context/ppchtex/m-pictex.sty b/tex/latex/context/ppchtex/m-pictex.sty
index 18630f2cc..a967b362d 100644
--- a/tex/latex/context/ppchtex/m-pictex.sty
+++ b/tex/latex/context/ppchtex/m-pictex.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{m-pictex}[2004/07/30 package wrapper for m-pictex.tex]
 
-\input{m-pictex.tex}
+\input{m-pictex.mkii}
 
-\endinput
\ No newline at end of file
+\endinput