2021-07-23 18:53:00

author: Hans Hagen <pragma@wxs.nl> 2021-07-23 19:46:04 +0200
committer: Context Git Mirror Bot <phg@phi-gamma.net> 2021-07-23 19:46:04 +0200
commit: c73351bc5e590d5a7ebd2b0f13f895a447d25794 (patch)
tree: 4e2028329e2c0b63a7818463918397de328d6432
parent: ed85eb918354b77672bbe347c2afcfe2e0b6b7fb (diff)
download: context-c73351bc5e590d5a7ebd2b0f13f895a447d25794.tar.gz
159 files changed, 455 insertions, 306 deletions
diff --git a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
index 1b1a86ddd..6e85123ef 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-metafun.lua
@@ -1,4 +1,4 @@
 return {
  ["commands"]={ "loadfile", "loadimage", "loadmodule", "dispose", "nothing", "transparency", "tolist", "topath", "tocycle", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "tanh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "unittriangle", "fulltriangle", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "randomizedcontrols", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "perpendicular", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "drawdoublearrows", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "boundingradius", "boundingcircle", "boundingpoint", "crossingunder", "insideof", "outsideof", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshaderadius", "withshadetransform", "withshadecenterone", "withshadecentertwo", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "shownshadedirection", "shownshadecenter", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext", "notcached", "keepcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "withopacity", "property", "properties", "withproperties", "asgroup", "withpattern", "withpatternscale", "withpatternfloat", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "colorlike", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "resetarrows", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "resolvedcolor", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "pencilled", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "dofill", "fillup", "eofillup", "nodraw", "dodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "setglobalmacro", "setglobaldimen", "setglobalcount", "setglobaltoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utfnum", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "lualist", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex", "newscriptindex", "newcolor", "newrgbcolor", "newcmykcolor", "newnumeric", "newboolean", "newtransform", "newpath", "newpicture", "newstring", "newpair", "mpvard", "mpvarn", "mpvars", "mpvar", "withtolerance" },
- ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "minifunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor", "record", "newrecord", "setrecord", "getrecord", "anchorxy", "anchorx", "anchory", "anchorht", "anchordp", "anchorul", "anchorll", "anchorlr", "anchorur", "localanchorbox", "localanchorcell", "localanchorspan", "anchorbox", "anchorcell", "anchorspan", "matrixbox", "matrixcell", "matrixspan" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "minifunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "setluaparameter", "definecolor", "record", "newrecord", "setrecord", "getrecord", "anchorxy", "anchorx", "anchory", "anchorht", "anchordp", "anchorul", "anchorll", "anchorlr", "anchorur", "localanchorbox", "localanchorcell", "localanchorspan", "anchorbox", "anchorcell", "anchorspan", "matrixbox", "matrixcell", "matrixspan" },
 }
 \ No newline at end of file
diff --git a/context/data/scite/context/scite-context-data-metafun.properties b/context/data/scite/context/scite-context-data-metafun.properties
index 2e953df8d..0e7d7e066 100644
--- a/context/data/scite/context/scite-context-data-metafun.properties
+++ b/context/data/scite/context/scite-context-data-metafun.properties
@@ -93,10 +93,10 @@ metapostversion maxdimensions drawoptionsfactor dq sq \
 crossingscale crossingoption contextlmtxmode metafunversion minifunversion \
 getparameters presetparameters hasparameter hasoption getparameter \
 getparameterdefault getparametercount getmaxparametercount getparameterpath getparameterpen \
-getparametertext applyparameters pushparameters popparameters definecolor \
-record newrecord setrecord getrecord anchorxy \
-anchorx anchory anchorht anchordp anchorul \
-anchorll anchorlr anchorur localanchorbox localanchorcell \
-localanchorspan anchorbox anchorcell anchorspan matrixbox \
-matrixcell matrixspan 
+getparametertext applyparameters pushparameters popparameters setluaparameter \
+definecolor record newrecord setrecord getrecord \
+anchorxy anchorx anchory anchorht anchordp \
+anchorul anchorll anchorlr anchorur localanchorbox \
+localanchorcell localanchorspan anchorbox anchorcell anchorspan \
+matrixbox matrixcell matrixspan 
 
diff --git a/context/data/textadept/context/data/scite-context-data-metafun.lua b/context/data/textadept/context/data/scite-context-data-metafun.lua
index 1b1a86ddd..6e85123ef 100644
--- a/context/data/textadept/context/data/scite-context-data-metafun.lua
+++ b/context/data/textadept/context/data/scite-context-data-metafun.lua
@@ -1,4 +1,4 @@
 return {
  ["commands"]={ "loadfile", "loadimage", "loadmodule", "dispose", "nothing", "transparency", "tolist", "topath", "tocycle", "sqr", "log", "ln", "exp", "inv", "pow", "pi", "radian", "tand", "cotd", "sin", "cos", "tan", "cot", "atan", "asin", "acos", "invsin", "invcos", "invtan", "acosh", "asinh", "sinh", "cosh", "tanh", "zmod", "paired", "tripled", "unitcircle", "fulldiamond", "unitdiamond", "fullsquare", "unittriangle", "fulltriangle", "llcircle", "lrcircle", "urcircle", "ulcircle", "tcircle", "bcircle", "lcircle", "rcircle", "lltriangle", "lrtriangle", "urtriangle", "ultriangle", "uptriangle", "downtriangle", "lefttriangle", "righttriangle", "triangle", "smoothed", "cornered", "superellipsed", "randomized", "randomizedcontrols", "squeezed", "enlonged", "shortened", "punked", "curved", "unspiked", "simplified", "blownup", "stretched", "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged", "crossed", "laddered", "randomshifted", "interpolated", "perpendicular", "paralleled", "cutends", "peepholed", "llenlarged", "lrenlarged", "urenlarged", "ulenlarged", "llmoved", "lrmoved", "urmoved", "ulmoved", "rightarrow", "leftarrow", "centerarrow", "drawdoublearrows", "boundingbox", "innerboundingbox", "outerboundingbox", "pushboundingbox", "popboundingbox", "boundingradius", "boundingcircle", "boundingpoint", "crossingunder", "insideof", "outsideof", "bottomboundary", "leftboundary", "topboundary", "rightboundary", "xsized", "ysized", "xysized", "sized", "xyscaled", "intersection_point", "intersection_found", "penpoint", "bbwidth", "bbheight", "withshade", "withcircularshade", "withlinearshade", "defineshade", "shaded", "shadedinto", "withshadecolors", "withshadedomain", "withshademethod", "withshadefactor", "withshadevector", "withshadecenter", "withshadedirection", "withshaderadius", "withshadetransform", "withshadecenterone", "withshadecentertwo", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "shownshadedirection", "shownshadecenter", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext", "notcached", "keepcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "withopacity", "property", "properties", "withproperties", "asgroup", "withpattern", "withpatternscale", "withpatternfloat", "infont", "space", "crlf", "dquote", "percent", "SPACE", "CRLF", "DQUOTE", "PERCENT", "grayscale", "greyscale", "withgray", "withgrey", "colorpart", "colorlike", "readfile", "clearxy", "unitvector", "center", "epsed", "anchored", "originpath", "infinite", "break", "xstretched", "ystretched", "snapped", "pathconnectors", "function", "constructedfunction", "constructedpath", "constructedpairs", "straightfunction", "straightpath", "straightpairs", "curvedfunction", "curvedpath", "curvedpairs", "evenly", "oddly", "condition", "pushcurrentpicture", "popcurrentpicture", "arrowpath", "resetarrows", "tensecircle", "roundedsquare", "colortype", "whitecolor", "blackcolor", "basiccolors", "complementary", "complemented", "resolvedcolor", "normalfill", "normaldraw", "visualizepaths", "detailpaths", "naturalizepaths", "drawboundary", "drawwholepath", "drawpathonly", "visualizeddraw", "visualizedfill", "detaileddraw", "draworigin", "drawboundingbox", "drawpath", "drawpoint", "drawpoints", "drawcontrolpoints", "drawcontrollines", "drawpointlabels", "drawlineoptions", "drawpointoptions", "drawcontroloptions", "drawlabeloptions", "draworiginoptions", "drawboundoptions", "drawpathoptions", "resetdrawoptions", "undashed", "pencilled", "decorated", "redecorated", "undecorated", "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote", "startpassingvariable", "stoppassingvariable", "eofill", "eoclip", "nofill", "dofill", "fillup", "eofillup", "nodraw", "dodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "setglobalmacro", "setglobaldimen", "setglobalcount", "setglobaltoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utfnum", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "lualist", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex", "newscriptindex", "newcolor", "newrgbcolor", "newcmykcolor", "newnumeric", "newboolean", "newtransform", "newpath", "newpicture", "newstring", "newpair", "mpvard", "mpvarn", "mpvars", "mpvar", "withtolerance" },
- ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "minifunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor", "record", "newrecord", "setrecord", "getrecord", "anchorxy", "anchorx", "anchory", "anchorht", "anchordp", "anchorul", "anchorll", "anchorlr", "anchorur", "localanchorbox", "localanchorcell", "localanchorspan", "anchorbox", "anchorcell", "anchorspan", "matrixbox", "matrixcell", "matrixspan" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "minifunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "setluaparameter", "definecolor", "record", "newrecord", "setrecord", "getrecord", "anchorxy", "anchorx", "anchory", "anchorht", "anchordp", "anchorul", "anchorll", "anchorlr", "anchorur", "localanchorbox", "localanchorcell", "localanchorspan", "anchorbox", "anchorcell", "anchorspan", "matrixbox", "matrixcell", "matrixspan" },
 }
 \ No newline at end of file
diff --git a/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json b/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
index f446e67d1..1dd8aed69 100644
--- a/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
+++ b/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
@@ -138,7 +138,7 @@
    "name" : "context.string.string.text.mps"
   },
   "shortcut" : {
-   "match" : "(vrbcatcoderegime|txtcatcoderegime|textextoffset|textextanchor|texcatcoderegime|squared|sq|softlighttransparent|shadeoffset|shadefactor|setrecord|screentransparent|saturationtransparent|rounded|rgbcolormodel|record|pushparameters|prtcatcoderegime|presetparameters|popparameters|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|notcatcoderegime|normaltransparent|nocolormodel|newrecord|multiplytransparent|mitered|minifunversion|metapostversion|metafunversion|maxdimensions|matrixspan|matrixcell|matrixbox|luminositytransparent|luacatcoderegime|localanchorspan|localanchorcell|localanchorbox|lightentransparent|labeloffset|join_radius|inicatcoderegime|infinity|huetransparent|hasparameter|hasoption|hardlighttransparent|greycolormodel|graycolormodel|getrecord|getparametertext|getparameters|getparameterpen|getparameterpath|getparameterdefault|getparametercount|getparameter|getmaxparametercount|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|definecolor|defaultscale|defaultpen|darkentransparent|ctxcatcoderegime|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|catcoderegime|butt|beveled|bboxmargin|applyparameters|anchory|anchorxy|anchorx|anchorur|anchorul|anchorspan|anchorlr|anchorll|anchorht|anchordp|anchorcell|anchorbox|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-�])",
+   "match" : "(vrbcatcoderegime|txtcatcoderegime|textextoffset|textextanchor|texcatcoderegime|squared|sq|softlighttransparent|shadeoffset|shadefactor|setrecord|setluaparameter|screentransparent|saturationtransparent|rounded|rgbcolormodel|record|pushparameters|prtcatcoderegime|presetparameters|popparameters|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|notcatcoderegime|normaltransparent|nocolormodel|newrecord|multiplytransparent|mitered|minifunversion|metapostversion|metafunversion|maxdimensions|matrixspan|matrixcell|matrixbox|luminositytransparent|luacatcoderegime|localanchorspan|localanchorcell|localanchorbox|lightentransparent|labeloffset|join_radius|inicatcoderegime|infinity|huetransparent|hasparameter|hasoption|hardlighttransparent|greycolormodel|graycolormodel|getrecord|getparametertext|getparameters|getparameterpen|getparameterpath|getparameterdefault|getparametercount|getparameter|getmaxparametercount|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|definecolor|defaultscale|defaultpen|darkentransparent|ctxcatcoderegime|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|catcoderegime|butt|beveled|bboxmargin|applyparameters|anchory|anchorxy|anchorx|anchorur|anchorul|anchorspan|anchorlr|anchorll|anchorht|anchordp|anchorcell|anchorbox|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-�])",
    "name" : "context.data.shortcut.mps"
   },
   "special" : {
diff --git a/doc/context/documents/general/manuals/followingup.pdf b/doc/context/documents/general/manuals/followingup.pdf
index 4c2f27291..43a71517d 100644
--- a/doc/context/documents/general/manuals/followingup.pdf
+++ b/doc/context/documents/general/manuals/followingup.pdf
diff --git a/doc/context/documents/general/manuals/luametafun.pdf b/doc/context/documents/general/manuals/luametafun.pdf
index 48bfa6b04..caa40e26d 100644
--- a/doc/context/documents/general/manuals/luametafun.pdf
+++ b/doc/context/documents/general/manuals/luametafun.pdf
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index 2db4dc1df..5843ef324 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf
index eed48236a..7bd85bca6 100644
--- a/doc/context/documents/general/manuals/luatex.pdf
+++ b/doc/context/documents/general/manuals/luatex.pdf
diff --git a/doc/context/documents/general/manuals/math-mkiv.pdf b/doc/context/documents/general/manuals/math-mkiv.pdf
index 292c49527..432c67941 100644
--- a/doc/context/documents/general/manuals/math-mkiv.pdf
+++ b/doc/context/documents/general/manuals/math-mkiv.pdf
diff --git a/doc/context/sources/general/manuals/followingup/followingup-bitmaps.tex b/doc/context/sources/general/manuals/followingup/followingup-bitmaps.tex
index cf74c0cad..77e32442e 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-bitmaps.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-bitmaps.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-bitmaps
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-cleanup.tex b/doc/context/sources/general/manuals/followingup/followingup-cleanup.tex
index 7dcb3b3b1..d66098f74 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-cleanup.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-cleanup.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 % Youtube: TheLucs play with Jacob Collier // Don't stop til you get enough
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-compilation.tex b/doc/context/sources/general/manuals/followingup/followingup-compilation.tex
index 9e4b10662..981142230 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-compilation.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-compilation.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-compilation
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-contents.tex b/doc/context/sources/general/manuals/followingup/followingup-contents.tex
index 3fbfc701a..a415ab322 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-contents.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-contents.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/followingup
+
 \startcomponent followingup-contents
 
 \environment followingup-style
diff --git a/doc/context/sources/general/manuals/followingup/followingup-directions.tex b/doc/context/sources/general/manuals/followingup/followingup-directions.tex
index 244baff90..81aa16b74 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-directions.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-directions.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-directions
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-evolution.tex b/doc/context/sources/general/manuals/followingup/followingup-evolution.tex
index 730f4cc1b..654de2421 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-evolution.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-evolution.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-evolution
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-expressions.tex b/doc/context/sources/general/manuals/followingup/followingup-expressions.tex
index 9819f58c6..f5bce052c 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-expressions.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-expressions.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-expressions
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-feedback.tex b/doc/context/sources/general/manuals/followingup/followingup-feedback.tex
index d77ef302c..7db239b2b 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-feedback.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-feedback.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-feedback
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-fonts.tex b/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
index 411ee7b5e..fbf0158cb 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-fonts
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-formats.tex b/doc/context/sources/general/manuals/followingup/followingup-formats.tex
index c0877f1c0..9b55c472a 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-formats.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-formats.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \environment followingup-style
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-introduction.tex b/doc/context/sources/general/manuals/followingup/followingup-introduction.tex
index c4a5920bd..0d23b81dd 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-introduction.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-introduction.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-introduction
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-logging.tex b/doc/context/sources/general/manuals/followingup/followingup-logging.tex
index e82df3c04..796526862 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-logging.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-logging.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-logging
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-lua.tex b/doc/context/sources/general/manuals/followingup/followingup-lua.tex
index f0f3350a3..5ff821a3b 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-lua.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-lua.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-lua
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-memory.tex b/doc/context/sources/general/manuals/followingup/followingup-memory.tex
index 63e3821ed..f4f5adb4c 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-memory.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-memory.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-memory
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-mp.tex b/doc/context/sources/general/manuals/followingup/followingup-mp.tex
index 22e8e8356..442118d8c 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-mp.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-mp.tex
@@ -1,6 +1,4 @@
-% language=us
-
-\registerctxluafile{mlib-scn}{}
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-mp
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-performance.tex b/doc/context/sources/general/manuals/followingup/followingup-performance.tex
index 40eb1971d..667b111d4 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-performance.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-performance.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-performance
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-rejected.tex b/doc/context/sources/general/manuals/followingup/followingup-rejected.tex
index f357c0ae5..4cb1fc95c 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-rejected.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-rejected.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-rejected
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-retrospect.tex b/doc/context/sources/general/manuals/followingup/followingup-retrospect.tex
index b99185b77..1123e3928 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-retrospect.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-retrospect.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-retrospect
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-stripping.tex b/doc/context/sources/general/manuals/followingup/followingup-stripping.tex
index 69af6376c..c90e8645b 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-stripping.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-stripping.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 %  2,777,600 / 11,561,471 cont-en.fmt
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-stubs.tex b/doc/context/sources/general/manuals/followingup/followingup-stubs.tex
index 69d02adc7..996fe1d68 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-stubs.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-stubs.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-stubs
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-style.tex b/doc/context/sources/general/manuals/followingup/followingup-style.tex
index 51519f137..651890a24 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-style.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-style.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/followingup
+
 % \enablelmtx
 % \nopdfcompression
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-tex.tex b/doc/context/sources/general/manuals/followingup/followingup-tex.tex
index 5524baf53..4e4fcf69f 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-tex.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-tex.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-tex
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup-titlepage.tex b/doc/context/sources/general/manuals/followingup/followingup-titlepage.tex
index 0f46ee9ca..adca20aa9 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-titlepage.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-titlepage.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/followingup
+
 \startcomponent followingup-titlepage
 
 \environment followingup-style
diff --git a/doc/context/sources/general/manuals/followingup/followingup-whatsits.tex b/doc/context/sources/general/manuals/followingup/followingup-whatsits.tex
index 64c817573..b70c53354 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-whatsits.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-whatsits.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/followingup
 
 \startcomponent followingup-whatsits
 
diff --git a/doc/context/sources/general/manuals/followingup/followingup.tex b/doc/context/sources/general/manuals/followingup/followingup.tex
index d5be61eea..6d7c63bf6 100644
--- a/doc/context/sources/general/manuals/followingup/followingup.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/followingup
+
 \environment followingup-style
 
 \dontcomplain
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-boxes.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-boxes.tex
index 9a097b878..cf8b1a51f 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-boxes.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-boxes.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 % \hfil \hss
 % spread
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-characters.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-characters.tex
index ee3ab4044..c3d417e44 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-characters.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-characters.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-conditionals.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-conditionals.tex
index 9be2fb4ec..dfff4ac72 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-conditionals.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-conditionals.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-expansion.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-expansion.tex
index 15faa802d..8d006437e 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-expansion.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-expansion.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-grouping.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-grouping.tex
index eadcca6a9..a3bfe79c9 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-grouping.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-grouping.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-macros.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-macros.tex
index 033bdee80..a69eec797 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-macros.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-macros.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 % Extending the macro argument parser happened stepwise and at each step a bit of
 % \CONTEXT\ code was adapted for testing. At the beginning of October the 20201010
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-paragraphs.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-paragraphs.tex
index a15ddb622..19cf6bfb6 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-paragraphs.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-paragraphs.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-registers.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-registers.tex
index 8ccb0cd3a..f24019f0d 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-registers.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-registers.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 \environment lowlevel-style
 
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-scope.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-scope.tex
index 1313de923..484e80a0b 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-scope.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-scope.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 % \hfil \hss
 % spread
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-security.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-security.tex
index 4f705e37c..0abc557b6 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-security.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-security.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 % It took some time to get the right balance of using the overload related features
 % but at some point it started feeling right. Of course it will never be as
diff --git a/doc/context/sources/general/manuals/lowlevel/lowlevel-style.tex b/doc/context/sources/general/manuals/lowlevel/lowlevel-style.tex
index ddd9df747..12ccee0b5 100644
--- a/doc/context/sources/general/manuals/lowlevel/lowlevel-style.tex
+++ b/doc/context/sources/general/manuals/lowlevel/lowlevel-style.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/lowlevel
 
 % I started this series in June 2019 and I bet that it will never be complete or
 % extensive enough. But I'll do my best to make it as useful as possible ConTeXt
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-arrow.tex b/doc/context/sources/general/manuals/luametafun/luametafun-arrow.tex
index a2c4636ed..cc2856c4c 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-arrow.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-arrow.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-axis.tex b/doc/context/sources/general/manuals/luametafun/luametafun-axis.tex
index f9483039c..4ada10f13 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-axis.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-axis.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-chart.tex b/doc/context/sources/general/manuals/luametafun/luametafun-chart.tex
index 1bd89d350..00d453973 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-chart.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-chart.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-color.tex b/doc/context/sources/general/manuals/luametafun/luametafun-color.tex
index 17f4a449d..c1983a4bc 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-color.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-color.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-contents.tex b/doc/context/sources/general/manuals/luametafun/luametafun-contents.tex
index 73800ba8b..d4d631206 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-contents.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-contents.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-contour.tex b/doc/context/sources/general/manuals/luametafun/luametafun-contour.tex
index 11eca8b7a..5425fe991 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-contour.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-contour.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-followtext.tex b/doc/context/sources/general/manuals/luametafun/luametafun-followtext.tex
index 079131565..765058e31 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-followtext.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-followtext.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-fonts.tex b/doc/context/sources/general/manuals/luametafun/luametafun-fonts.tex
index 27ea2fd00..ef9ed6656 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-fonts.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-fonts.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-function.tex b/doc/context/sources/general/manuals/luametafun/luametafun-function.tex
index 79fa97a21..8592e3140 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-function.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-function.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-grid.tex b/doc/context/sources/general/manuals/luametafun/luametafun-grid.tex
index 719d8023d..e1dee194c 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-grid.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-grid.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-groups.tex b/doc/context/sources/general/manuals/luametafun/luametafun-groups.tex
index b29ab3cbf..8c9dbd124 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-groups.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-groups.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-interface.tex b/doc/context/sources/general/manuals/luametafun/luametafun-interface.tex
index 662ae61a8..26ee383d3 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-interface.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-interface.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-introduction.tex b/doc/context/sources/general/manuals/luametafun/luametafun-introduction.tex
index fa0e28510..54f14bfe8 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-introduction.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-introduction.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-mesh-examples.tex b/doc/context/sources/general/manuals/luametafun/luametafun-mesh-examples.tex
deleted file mode 100644
index 87f6d105f..000000000
--- a/doc/context/sources/general/manuals/luametafun/luametafun-mesh-examples.tex
+++ /dev/null
@@ -1,161 +0,0 @@
-\startbuffer[1]
-\startuseMPgraphic{MyPath1}
-    fill OverlayBox withcolor "darkyellow" ;
-    save p ; path p[] ;
-    p1 := unitsquare xysized( OverlayWidth/4, OverlayHeight/4) ;
-    p2 := unitsquare xysized(2OverlayWidth/4,3OverlayHeight/5) shifted ( OverlayWidth/4,0) ;
-    p3 := unitsquare xysized( OverlayWidth/4, OverlayHeight  ) shifted (3OverlayWidth/4,0) ;
-    fill p1 withcolor "darkred" ;
-    fill p2 withcolor "darkblue" ;
-    fill p3 withcolor "darkgreen" ;
-    draw lmt_mesh [ paths = { p1, p2, p3 } ] ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[2]
-\startuseMPgraphic{MyPath2}
-    save q ; path q ; q := unitcircle xysized(OverlayWidth,OverlayHeight) ;
-    save p ; path p ; p := for i=1 upto length(q) :
-        (center q) -- (point (i-1) of q) -- (point i of q) -- (center q) --
-    endfor cycle ;
-    fill q withcolor "darkgray" ;
-    draw lmt_mesh [
-        trace = true,
-        paths = { p }
-    ] withcolor "darkred" ;
-
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[3]
-\startuseMPgraphic{MyPath3}
-    save q ; path q ; q := unitcircle xysized(OverlayWidth,OverlayHeight) randomized 3mm ;
-    fill q withcolor "darkgray" ;
-    draw lmt_mesh [
-        trace = true,
-        paths = { meshed(q,OverlayBox,.05) }
-    ] withcolor "darkgreen" ;
-  % draw OverlayMesh(q,.025) withcolor "darkgreen" ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[4]
-\startuseMPgraphic{MyPath4}
-    save q ; path q ; q := unitcircle xysized(OverlayWidth,OverlayHeight) randomized 3mm ;
-    fill q withcolor "darkgray" ;
-    draw lmt_mesh [
-        trace = true,
-        auto  = true,
-        step  = 0.0125,
-        paths = { q }
-    ] withcolor "darkyellow" ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[5]
-\startuseMPgraphic{MyPath5}
-    save q ; path q ; q := unitdiamond xysized(OverlayWidth,OverlayHeight) randomized 2mm ;
-    q := q shifted - center q shifted center OverlayBox ;
-    fill q withcolor "darkgray" ;
-    draw lmt_mesh [
-        trace = true,
-        auto  = true,
-        step  = 0.0125,
-        paths = { q }
-    ] withcolor "darkmagenta" ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[6]
-\startuseMPgraphic{MyPath6}
-    save p ; path p[] ;
-    p1 := p2 := fullcircle xysized(2OverlayWidth/5,2OverlayHeight/3) ;
-    p1 := p1 shifted - center p1 shifted center OverlayBox shifted (-1OverlayWidth/4,0) ;
-    p2 := p2 shifted - center p2 shifted center OverlayBox shifted ( 1OverlayWidth/4,0) ;
-    fill p1 withcolor "middlegray" ;
-    fill p2 withcolor "middlegray" ;
-    draw lmt_mesh [
-        trace = true,
-        auto  = true,
-        step  = 0.02,
-        paths = { p1, p2 }
-    ] withcolor "darkcyan" ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\startbuffer[7]
-\startuseMPgraphic{MyPath7}
-    save p ; path p[] ;
-    p1 := p2 := fullcircle xysized(2OverlayWidth/5,2OverlayHeight/3) rotated 45 ;
-    p1 := p1 shifted - center p1 shifted center OverlayBox shifted (-1OverlayWidth/4,0) ;
-    p2 := p2 shifted - center p2 shifted center OverlayBox shifted ( 1OverlayWidth/4,0) ;
-    fill p1 withcolor "middlegray" ;
-    fill p2 withcolor "middlegray" ;
-    draw lmt_mesh [
-        trace = true,
-        auto  = true,
-        step  = 0.01,
-        box   = OverlayBox enlarged -5mm,
-        paths = { p1, p2 }
-    ] withcolor "darkcyan" ;
-    draw OverlayBox enlarged -5mm withcolor "darkgray" ;
-    setbounds currentpicture to OverlayBox ;
-\stopuseMPgraphic
-\stopbuffer
-
-\continueifinputfile {luametafun-mesh-examples.tex}
-
-\setupbodyfont[dejavu]
-
-\setupinteraction
-  [state=start,
-   color=white,
-   contrastcolor=white]
-
-\starttext
-
-    \getbuffer[1,2,3,4,5,6,7]
-
-    \defineoverlay[MyPath1][\useMPgraphic{MyPath1}]
-    \defineoverlay[MyPath2][\useMPgraphic{MyPath2}]
-    \defineoverlay[MyPath3][\useMPgraphic{MyPath3}]
-    \defineoverlay[MyPath4][\useMPgraphic{MyPath4}]
-    \defineoverlay[MyPath5][\useMPgraphic{MyPath5}]
-    \defineoverlay[MyPath6][\useMPgraphic{MyPath6}]
-    \defineoverlay[MyPath7][\useMPgraphic{MyPath7}]
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath1,frame=off]{Example 1}[realpage(2)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath2,frame=off]{Example 2}[realpage(3)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath3,frame=off]{Example 3}[realpage(4)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath4,frame=off]{Example 4}[realpage(5)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath5,frame=off]{Example 5}[realpage(6)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath6,frame=off]{Example 6}[realpage(7)]
-    \stopTEXpage
-
-    \startTEXpage
-        \button[height=3cm,width=4cm,background=MyPath7,frame=off]{Example 7}[realpage(1)]
-    \stopTEXpage
-
-\stoptext
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-mesh.tex b/doc/context/sources/general/manuals/luametafun/luametafun-mesh.tex
index 2fdb31250..88acff077 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-mesh.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-mesh.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 \environment luametafun-mesh-examples
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-outline.tex b/doc/context/sources/general/manuals/luametafun/luametafun-outline.tex
index e2cdb4226..9b5e4cef9 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-outline.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-outline.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-placeholder.tex b/doc/context/sources/general/manuals/luametafun/luametafun-placeholder.tex
index 3627bbfd0..9a71d1a96 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-placeholder.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-placeholder.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-poisson.tex b/doc/context/sources/general/manuals/luametafun/luametafun-poisson.tex
index cd4b6ddab..f6e9c40e4 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-poisson.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-poisson.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-shade.tex b/doc/context/sources/general/manuals/luametafun/luametafun-shade.tex
index a139be954..6eda02fe5 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-shade.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-shade.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-style.tex b/doc/context/sources/general/manuals/luametafun/luametafun-style.tex
index 63eb7e375..1d2b93dd2 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-style.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-style.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametafun
+
 \startenvironment luametafun-style
 
 \usemodule[abbreviations-smallcaps]
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex b/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex
index 0014fa725..3073cad67 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-surface.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-svg.tex b/doc/context/sources/general/manuals/luametafun/luametafun-svg.tex
index 069abc6a6..326daff10 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-svg.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-svg.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-technology.tex b/doc/context/sources/general/manuals/luametafun/luametafun-technology.tex
index 910a9dd60..79ad37a2a 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-technology.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-technology.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-text.tex b/doc/context/sources/general/manuals/luametafun/luametafun-text.tex
index 4f08ee00f..202d77aa2 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-text.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-text.tex
@@ -1,4 +1,4 @@
-% language=us
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun-titlepage.tex b/doc/context/sources/general/manuals/luametafun/luametafun-titlepage.tex
index 4450199e6..d83cafc13 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun-titlepage.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun-titlepage.tex
@@ -1,3 +1,4 @@
+% language=us runpath=texruns:manuals/luametafun
 
 \environment luametafun-style
 
diff --git a/doc/context/sources/general/manuals/luametafun/luametafun.tex b/doc/context/sources/general/manuals/luametafun/luametafun.tex
index 6aaf166a5..785fd03df 100644
--- a/doc/context/sources/general/manuals/luametafun/luametafun.tex
+++ b/doc/context/sources/general/manuals/luametafun/luametafun.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametafun
+
 % This file takes a while to process because we render some complex graphics. It
 % can be sped up by enabling caching, but for some images that has been disabled.
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-callbacks.tex b/doc/context/sources/general/manuals/luametatex/luametatex-callbacks.tex
index 213081e36..f24d2495a 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-callbacks.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-callbacks.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-codes.tex b/doc/context/sources/general/manuals/luametatex/luametatex-codes.tex
index 103bb2473..afec26d61 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-codes.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-codes.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \environment luametatex-style
 
 \startcomponent luametatex-codes
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-contents.tex b/doc/context/sources/general/manuals/luametatex/luametatex-contents.tex
index d55b7f15b..4e776b7d2 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-contents.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-contents.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \environment luametatex-style
 
 \startcomponent luametatex-contents
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-differences.tex b/doc/context/sources/general/manuals/luametatex/luametatex-differences.tex
index fdc04d58b..3e80f4ae5 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-differences.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-differences.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-enhancements.tex b/doc/context/sources/general/manuals/luametatex/luametatex-enhancements.tex
index c3cdc16a9..cdea1c69b 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-enhancements.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-enhancements.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-firstpage.tex b/doc/context/sources/general/manuals/luametatex/luametatex-firstpage.tex
index 83fb40df1..f2d3f5cfa 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-firstpage.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-firstpage.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \environment luametatex-style
 
 \startcomponent luametatex-firstpage
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-fonts.tex b/doc/context/sources/general/manuals/luametatex/luametatex-fonts.tex
index 56523e224..663b328ba 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-fonts.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-fonts.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-internals.tex b/doc/context/sources/general/manuals/luametatex/luametatex-internals.tex
index 70d45cfeb..68fdc0307 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-internals.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-internals.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex b/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
index edf1bdd78..472434602 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-introduction.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-languages.tex b/doc/context/sources/general/manuals/luametatex/luametatex-languages.tex
index 1adab5c3a..236236abe 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-languages.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-languages.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-libraries.tex b/doc/context/sources/general/manuals/luametatex/luametatex-libraries.tex
index 407544700..086dc18a2 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-libraries.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-libraries.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-lua.tex b/doc/context/sources/general/manuals/luametatex/luametatex-lua.tex
index 8b707c6dd..c48ad822f 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-lua.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-lua.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-math.tex b/doc/context/sources/general/manuals/luametatex/luametatex-math.tex
index 02f5f8c71..44d7dbe19 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-math.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-math.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-metapost.tex b/doc/context/sources/general/manuals/luametatex/luametatex-metapost.tex
index 31abe2229..5e6442232 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-metapost.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-metapost.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-modifications.tex b/doc/context/sources/general/manuals/luametatex/luametatex-modifications.tex
index f720b8f6f..3202f1ff6 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-modifications.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-modifications.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-nodes.tex b/doc/context/sources/general/manuals/luametatex/luametatex-nodes.tex
index bcdac0d39..189fe2173 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-nodes.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-nodes.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-pdf.tex b/doc/context/sources/general/manuals/luametatex/luametatex-pdf.tex
index 3412d0820..1394df9f5 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-pdf.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-pdf.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 % lua.newtable
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-primitives.tex b/doc/context/sources/general/manuals/luametatex/luametatex-primitives.tex
index edbf7d32c..0d6af420e 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-primitives.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-primitives.tex
@@ -1 +1,3 @@
-\starttext \ctxlua {table.save(tex.jobname .. '.lua',tex.primitives())} \stoptext
-\ No newline at end of file
+% language=us runpath=texruns:manuals/luametatex
+
+\starttext \ctxlua {table.save(tex.jobname .. '.lua',tex.primitives())} \stoptext
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-registers.tex b/doc/context/sources/general/manuals/luametatex/luametatex-registers.tex
index 6d33ed3f4..060808176 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-registers.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-registers.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \environment luametatex-style
 
 \startcomponent luametatex-registers
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-statistics.tex b/doc/context/sources/general/manuals/luametatex/luametatex-statistics.tex
index d779a0899..23ccf24d4 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-statistics.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-statistics.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-style.tex b/doc/context/sources/general/manuals/luametatex/luametatex-style.tex
index b859eaeb0..82ef694ae 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-style.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-style.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \startenvironment luametatex-style
 
 %     \environment luatex-style
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
index 1cb03677b..d7ccae6eb 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-tex.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/luametatex
 
 \environment luametatex-style
 
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-titlepage.tex b/doc/context/sources/general/manuals/luametatex/luametatex-titlepage.tex
index 6f7a6f9a5..0d33cda0c 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex-titlepage.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex-titlepage.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 \environment luametatex-style
 
 \startcomponent luametatex-titlepage
diff --git a/doc/context/sources/general/manuals/luametatex/luametatex.tex b/doc/context/sources/general/manuals/luametatex/luametatex.tex
index 3f0e7efd1..bd4029a57 100644
--- a/doc/context/sources/general/manuals/luametatex/luametatex.tex
+++ b/doc/context/sources/general/manuals/luametatex/luametatex.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/luametatex
+
 % ------------------------   ------ ------------------   ------------------------
 % 2019-12-17  32bit  64bit   2020-01-10  32bit  64bit   2020-11-30  32bit  64bit
 % ------------------------   ------------------------   ------------------------
@@ -120,7 +122,7 @@
     \component luametatex-metapost
     \component luametatex-pdf
     \component luametatex-libraries
-    \component luametatex-primitives
+    \component luametatex-primitives % this generates a list
 \stopbodymatter
 
 \startbackmatter
diff --git a/doc/context/sources/general/manuals/luametatex/luatex-primitives.lua b/doc/context/sources/general/manuals/luametatex/luatex-primitives.lua
new file mode 100644
index 000000000..49ffed7eb
--- /dev/null
+++ b/doc/context/sources/general/manuals/luametatex/luatex-primitives.lua
@@ -0,0 +1 @@
+return { "vskip", "Umathcloseopspacing", "unless", "botmarks", "textdir", "write", "vsize", "Umathordpunctspacing", "currentiftype", "Udelimiterunder", " ", "boundary", "unhcopy", "pagediscards", "mathsurroundmode", "output", "-", "/", "Uskewedwithdelims", "unskip", "bodydirection", "unvbox", "Umathopenpunctspacing", "boxmaxdepth", "muskipdef", "string", "pagebottomoffset", "mutoglue", "luabytecodecall", "mathsurroundskip", "toksdef", "displaywidowpenalties", "endlocalcontrol", "Umathordinnerspacing", "Umathbinclosespacing", "floatingpenalty", "righthyphenmin", "voffset", "toksapp", "rightghost", "fontcharic", "fontchardp", "escapechar", "fontcharht", "Umathlimitbelowbgap", "topmark", "fontcharwd", "Umathopeninnerspacing", "textdirection", "nolocaldirs", "splitfirstmark", "vsplit", "everydisplay", "badness", "tokspre", "xleaders", "textfont", "showlists", "language", "Umathnolimitsubfactor", "mathchoice", "Uoverdelimiter", "Umathpunctpunctspacing", "Umathclosepunctspacing", "mathdisplayskipmode", "saveimageresource", "mathrulesfam", "Umathrelordspacing", "topskip", "abovedisplayshortskip", "underline", "Umathsupbottommin", "Umathlimitbelowkern", "tracinglostchars", "copyfont", "pagedirection", "Umathstackdenomdown", "localrightbox", "Umathfractionrule", "pagefillstretch", "unvcopy", "widowpenalties", "splitbotmark", "Umathcharfam", "finalhyphendemerits", "Umathcloseinnerspacing", "Umathopenrelspacing", "atopwithdelims", "tracingifs", "Uhextensible", "Umathsupsubbottommax", "pretolerance", "leftmarginkern", "iffontchar", "Umathcloserelspacing", "linedirection", "fi", "dp", "eTeXVersion", "setlanguage", "ht", "mathchardef", "ifincsname", "nulldelimiterspace", "or", "wd", "Umathcharnum", "Umathinnerordspacing", "synctex", "luabytecode", "formatname", "pagegoal", "advance", "letterspacefont", "boxdirection", "pdfextension", "protected", "chardef", "catcode", "mathchar", "Umathrelinnerspacing", "topmarks", "showgroups", "scriptscriptfont", "mathcode", "leftskip", "Umathsubtopmax", "glueexpr", "randomseed", "pageshrink", "splitfirstmarks", "suppressoutererror", "predisplaydirection", "Umathsubsupshiftdown", "pagefilstretch", "Umathopbinspacing", "delcode", "Umathordbinspacing", "fontname", "Umathrelopspacing", "brokenpenalty", "Umathopenbinspacing", "suppressprimitiveerror", "Umathoverdelimiterbgap", "localleftbox", "alignmark", "Uunderdelimiter", "hyphenationmin", "Umathclosebinspacing", "Umathcodenum", "dvifeedback", "lastkern", "outputmode", "belowdisplayshortskip", "tolerance", "mathopen", "luafunction", "exhyphenpenalty", "compoundhyphenmode", "maxdepth", "Umathpunctopenspacing", "luacopyinputnodes", "Umathconnectoroverlapmin", "futurelet", "abovewithdelims", "crampedscriptscriptstyle", "csstring", "hangindent", "Umathradicaldegreeafter", "everyeof", "lastskip", "eTeXversion", "uniformdeviate", "linepenalty", "luatexversion", "everyjob", "xspaceskip", "globaldefs", "Umathfractionnumup", "rightmarginkern", "everypar", "Umathopclosespacing", "scriptfont", "clubpenalties", "mathrulesmode", "delimiter", "explicithyphenpenalty", "Umathordclosespacing", "savingvdiscards", "splitbotmarks", "Umathoverdelimitervgap", "etokspre", "afterassignment", "firstmark", "expanded", "suppressmathparerror", "Udelcode", "bodydir", "wordboundary", "showtokens", "immediateassigned", "tracingassigns", "shapemode", "dimexpr", "lineskiplimit", "lineskip", "def", "parshapedimen", "attribute", "nolocalwhatsits", "readline", "fam", "day", "iffalse", "textstyle", "end", "mag", "box", "belowdisplayskip", "Umathsubshiftdrop", "Umathsubshiftdown", "ifx", "matheqnogapstep", "Umathpunctrelspacing", "let", "errmessage", "lastsavedimageresourceindex", "exhyphenchar", "hss", "expandafter", "lastsavedimageresourcepages", "mathoption", "the", "displaywidth", "Umathradicaldegreeraise", "fixupboxesmode", "Uright", "mathsurround", "pagedepth", "adjustspacing", "looseness", "Umathsupshiftdrop", "Umathcharslot", "leaders", "Umathcloseclosespacing", "luatexrevision", "vss", "insertht", "localinterlinepenalty", "useboxresource", "ifhmode", "explicitdiscretionary", "Umathchar", "botmark", "Udelimiterover", "Ustack", "Umathcode", "mathdelimitersmode", "saveboxresource", "Udelcodenum", "gtoksapp", "tracingscantokens", "suppresslongerror", "displaystyle", "ignoreligaturesinfont", "accent", "immediate", "Umathaxis", "Umathfractionnumvgap", "ifmmode", "gtokspre", "mathflattenmode", "Umathskewedfractionhgap", "Umathrelclosespacing", "meaning", "Umathpunctbinspacing", "abovedisplayskip", "medmuskip", "emergencystretch", "Ustopdisplaymath", "quitvmode", "rightskip", "mathclose", "hangafter", "hoffset", "crampedscriptstyle", "letcharcode", "setrandomseed", "hyphenationbounds", "crampedtextstyle", "pagedir", "Umathbinrelspacing", "aftergroup", "Umathopordspacing", "dvivariable", "attributedef", "mathdirection", "Umathordordspacing", "pdffeedback", "cleaders", "romannumeral", "hbadness", "mathbin", "Umathskewedfractionvgap", "Umathopenordspacing", "showboxbreadth", "mathitalicsmode", "ifvmode", "jobname", "mathdir", "vbadness", "patterns", "nonstopmode", "errhelp", "predisplaypenalty", "outputbox", "Umathcloseordspacing", "Umathnolimitsupfactor", "endlinechar", "mathinner", "lastbox", "showboxdepth", "pagewidth", "postdisplaypenalty", "Ustopmath", "aligntab", "mathrel", "holdinginserts", "radical", "mathord", "prehyphenchar", "dviextension", "pagetotal", "luafunctioncall", "Umathpunctopspacing", "everycr", "breakafterdirmode", "adjdemerits", "Umathsubsupvgap", "luaescapestring", "prerelpenalty", "halign", "begincsname", "defaultskewchar", "tracingnesting", "errorcontextlines", "Umathradicalrule", "splitmaxdepth", "Uleft", "ifcase", "Umathunderbarrule", "noindent", "postexhyphenchar", "Umathradicaldegreebefore", "tracingmacros", "moveright", "predisplaysize", "Umathstacknumup", "tracingrestores", "message", "ifhbox", "deadcycles", "normaldeviate", "interlinepenalty", "mathpunct", "lccode", "ifdefined", "noboundary", "displayindent", "Umathbinopspacing", "nonscript", "xtoksapp", "everyhbox", "boxdir", "Ustartdisplaymath", "savecatcodetable", "Umathbinpunctspacing", "eTeXglueshrinkorder", "mathscriptboxmode", "tagcode", "global", "Uroot", "lastsavedboxresourceindex", "penalty", "tracingcommands", "everymath", "Unosuperscript", "nolimits", "noalign", "Umathoperatorsize", "directlua", "xtokspre", "inputlineno", "Uradical", "pagestretch", "parskip", "indent", "dimendef", "mathstyle", "Umathopopenspacing", "widowpenalty", "ifvbox", "above", "Umathordopenspacing", "automatichyphenpenalty", "Umathbininnerspacing", "spaceskip", "middle", "Umathinnerrelspacing", "clearmarks", "Umathoverbarvgap", "fontid", "displaylimits", "pausing", "Umathopenopenspacing", "immediateassignment", "everyvbox", "iftrue", "moveleft", "mathop", "Umathunderdelimiterbgap", "Umathoverbarrule", "endcsname", "setfontid", "crampeddisplaystyle", "ifabsdim", "Umathlimitabovebgap", "Umathcharclass", "dimen", "Umathstackvgap", "Umathinneropspacing", "currentifbranch", "Umathrelbinspacing", "ifcat", "clubpenalty", "splittopskip", "Umathcloseopenspacing", "ifcondition", "doublehyphendemerits", "ifdim", "pardir", "limits", "ifeof", "firstmarks", "ignorespaces", "initcatcodetable", "insert", "delimitershortfall", "lastnodetype", "ifodd", "nokerns", "pageleftoffset", "insertpenalties", "tracingpages", "hpack", "luadef", "vadjust", "tracingfonts", "nospaces", "tracingonline", "Umathrelopenspacing", "count", "Umathlimitabovekern", "ifnum", "Udelimiter", "savepos", "edef", "nohrule", "char", "begingroup", "mathrulethicknessmode", "tracingparagraphs", "hyphenation", "marks", "localbrokenpenalty", "Umathfractiondelsize", "exceptionpenalty", "hfuzz", "openout", "automaticdiscretionary", "currentgrouplevel", "leqno", "gleaders", "Umathunderdelimitervgap", "Umathinnerbinspacing", "hyphenpenalty", "vcenter", "hfil", "thickmuskip", "maxdeadcycles", "mkern", "hbox", "overfullrule", "noligs", "else", "hsize", "raise", "thinmuskip", "spacefactor", "input", "hrule", "left", "eqno", "parfillskip", "font", "valign", "dump", "relax", "hyphenpenaltymode", "draftmode", "prevdepth", "read", "shipout", "batchmode", "right", "automatichyphenmode", "setbox", "prebinoppenalty", "baselineskip", "Usubscript", "special", "mskip", "Umathcharnumdef", "endgroup", "uchyph", "binoppenalty", "rpcode", "interlinepenalties", "endinput", "omit", "pagefilllstretch", "muexpr", "overwithdelims", "unexpanded", "newlinechar", "vfilneg", "time", "tpack", "skip", "vfill", "span", "prevgraf", "over", "show", "vbox", "tracingstats", "year", "mathpenaltiesmode", "ifcsname", "defaulthyphenchar", "nullfont", "parshapeindent", "mathscriptcharmode", "muskip", "vpack", "toks", "Umathaccent", "pagetopoffset", "outer", "showifs", "multiply", "pageheight", "tracingoutput", "firstvalidlanguage", "catcodetable", "parindent", "parshapelength", "protrusionboundary", "displaywidowpenalty", "unhbox", "lefthyphenmin", "vtop", "mathaccent", "Umathspaceafterscript", "predisplaygapfactor", "primitive", "Umathinneropenspacing", "Uskewed", "pxdimen", "vfuzz", "glyphdimensionsmode", "overline", "Umathopenopspacing", "unkern", "splitdiscards", "gluetomu", "eTeXgluestretchorder", "glueshrink", "gluestretch", "glueshrinkorder", "gluestretchorder", "numexpr", "ifabsnum", "scantextokens", "scantokens", "interactionmode", "detokenize", "currentiflevel", "currentgrouptype", "mathnolimitsmode", "mathscriptsmode", "suppressifcsnameerror", "suppressfontnotfounderror", "savinghyphcodes", "lastlinefit", "tracinggroups", "eTeXrevision", "eTeXminorversion", "pardirection", "pdfvariable", "lateluafunction", "latelua", "useimageresource", "pagerightoffset", "linedir", "closeout", "showthe", "showbox", "uppercase", "lowercase", "closein", "openin", "errorstopmode", "scrollmode", "efcode", "lpcode", "skewchar", "hyphenchar", "hjcode", "preexhyphenchar", "posthyphenchar", "Umathinnerinnerspacing", "Umathinnerpunctspacing", "Umathinnerclosespacing", "Umathpunctinnerspacing", "Umathpunctclosespacing", "Umathpunctordspacing", "Umathopenclosespacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathbinopenspacing", "Umathbinbinspacing", "Umathbinordspacing", "Umathopinnerspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathopopspacing", "Umathordrelspacing", "Umathordopspacing", "Umathsupshiftup", "Umathlimitbelowvgap", "Umathlimitabovevgap", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathradicalvgap", "Umathradicalkern", "Umathunderbarvgap", "Umathunderbarkern", "Umathoverbarkern", "Umathquad", "sfcode", "uccode", "skipdef", "countdef", "Umathchardef", "glet", "xdef", "gdef", "long", "Uvextensible", "Umiddle", "atop", "Unosubscript", "Usuperscript", "scriptscriptstyle", "scriptstyle", "Ustartmath", "discretionary", "unpenalty", "copy", "lower", "kern", "vfil", "hfilneg", "hfill", "hskip", "crcr", "cr", "ifprimitive", "ifvoid", "ifinner", "if", "Uchar", "luatexbanner", "number", "lastypos", "lastxpos", "lastpenalty", "par", "novrule", "vrule", "etoksapp", "parshape", "noexpand", "mark", "leftghost", "fontdimen", "expandglyphsinfont", "divide", "lastnamedcs", "csname", "scriptspace", "protrudechars", "outputpenalty", "month", "delimiterfactor", "relpenalty", "tabskip" }
+\ No newline at end of file
diff --git a/doc/context/sources/general/manuals/luametatex/luatex-primitives.tex b/doc/context/sources/general/manuals/luametatex/luatex-primitives.tex
new file mode 100644
index 000000000..edbf7d32c
--- /dev/null
+++ b/doc/context/sources/general/manuals/luametatex/luatex-primitives.tex
@@ -0,0 +1 @@
+\starttext \ctxlua {table.save(tex.jobname .. '.lua',tex.primitives())} \stoptext
+\ No newline at end of file
diff --git a/doc/context/sources/general/manuals/luatex/luatex-contents.tex b/doc/context/sources/general/manuals/luatex/luatex-contents.tex
index 2582a81c7..3759078ab 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-contents.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-contents.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \environment luatex-style
 
 \startcomponent luatex-contents
diff --git a/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex b/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
index 537961661..a1b17ac16 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-enhancements.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-firstpage.tex b/doc/context/sources/general/manuals/luatex/luatex-firstpage.tex
index 772fbb3fe..fc94fe836 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-firstpage.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-firstpage.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \startcomponent luatex-firstpage
 
 \startstandardmakeup
diff --git a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
index 136d20dd3..498792c8c 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
@@ -1,4 +1,4 @@
-% language=uk engine=luatex
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
index 93d0215a8..bbe93f86c 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-introduction.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-languages.tex b/doc/context/sources/general/manuals/luatex/luatex-languages.tex
index d4a7bda60..cb9ca10f3 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-languages.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-languages.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-logos.tex b/doc/context/sources/general/manuals/luatex/luatex-logos.tex
index 3172336ec..ef5db3c4c 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-logos.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-logos.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \startenvironment luatex-logos
 
 \usemodule[abr-02]
diff --git a/doc/context/sources/general/manuals/luatex/luatex-lua.tex b/doc/context/sources/general/manuals/luatex/luatex-lua.tex
index 625334c1b..976505189 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-lua.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-lua.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-math.tex b/doc/context/sources/general/manuals/luatex/luatex-math.tex
index 54de255da..03961ab62 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-math.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-math.tex
@@ -1,4 +1,4 @@
-% language=uk engine=luatex
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
index bf4233165..1ce628f5e 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-modifications.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
index a379b7b0a..a45c15946 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-nodes.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-preamble.tex b/doc/context/sources/general/manuals/luatex/luatex-preamble.tex
index e63895284..1d0e3f808 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-preamble.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-preamble.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-registers.tex b/doc/context/sources/general/manuals/luatex/luatex-registers.tex
index 36b1ec051..b69b71b02 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-registers.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-registers.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \environment luatex-style
 
 \startcomponent luatex-registers
diff --git a/doc/context/sources/general/manuals/luatex/luatex-statistics.tex b/doc/context/sources/general/manuals/luatex/luatex-statistics.tex
index efd7f1c75..e008f17fd 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-statistics.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-statistics.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 \environment luatex-style
 
diff --git a/doc/context/sources/general/manuals/luatex/luatex-style.tex b/doc/context/sources/general/manuals/luatex/luatex-style.tex
index aa0a7edc3..a1dd4887f 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-style.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-style.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \startenvironment luatex-style
 
 % todo: use \useMPlibrary[lua]
diff --git a/doc/context/sources/general/manuals/luatex/luatex-titlepage.tex b/doc/context/sources/general/manuals/luatex/luatex-titlepage.tex
index d9ca4b3f9..726a1ae3f 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-titlepage.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-titlepage.tex
@@ -1,3 +1,5 @@
+% language=us engine=luatex runpath=texruns:manuals/luatex
+
 \environment luatex-style
 
 \startcomponent luatex-titlepage
diff --git a/doc/context/sources/general/manuals/luatex/luatex.tex b/doc/context/sources/general/manuals/luatex/luatex.tex
index 46739513a..4be4ae3fc 100644
--- a/doc/context/sources/general/manuals/luatex/luatex.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex.tex
@@ -1,4 +1,4 @@
-% macros=mkvi engine=luatex
+% language=us engine=luatex runpath=texruns:manuals/luatex
 
 % \nopdfcompression
 
diff --git a/doc/context/sources/general/manuals/math/math-alignments.tex b/doc/context/sources/general/manuals/math/math-alignments.tex
index bb2801b8a..2f0088c34 100644
--- a/doc/context/sources/general/manuals/math/math-alignments.tex
+++ b/doc/context/sources/general/manuals/math/math-alignments.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-alignments
diff --git a/doc/context/sources/general/manuals/math/math-combining.tex b/doc/context/sources/general/manuals/math/math-combining.tex
index 5cd2ccb9b..f47ec78a5 100644
--- a/doc/context/sources/general/manuals/math/math-combining.tex
+++ b/doc/context/sources/general/manuals/math/math-combining.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-combining
diff --git a/doc/context/sources/general/manuals/math/math-contents.tex b/doc/context/sources/general/manuals/math/math-contents.tex
index 7d8fb05c7..3432ccd52 100644
--- a/doc/context/sources/general/manuals/math/math-contents.tex
+++ b/doc/context/sources/general/manuals/math/math-contents.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-contents
diff --git a/doc/context/sources/general/manuals/math/math-definitions.tex b/doc/context/sources/general/manuals/math/math-definitions.tex
index d8903121a..61dee1be9 100644
--- a/doc/context/sources/general/manuals/math/math-definitions.tex
+++ b/doc/context/sources/general/manuals/math/math-definitions.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-definitions
@@ -77,8 +79,8 @@ So this time we get:
 
 \getbuffer
 
-We can now redefine the \quote {interiorset} symbol to use
-\type {0x2217} instead of \type {0x2218}:
+We can now redefine the \quote {interiorset} symbol to use \type {0x2217} instead
+of \type {0x2218}:
 
 \startbuffer
 \definemathover[mysymbol][interiorset]["2217]
@@ -92,7 +94,9 @@ We can now redefine the \quote {interiorset} symbol to use
 
 Of course normally you will not use color:
 
+\pushoverloadmode
 \getbuffer
+\popoverloadmode
 
 \stopsection
 
diff --git a/doc/context/sources/general/manuals/math/math-features.tex b/doc/context/sources/general/manuals/math/math-features.tex
index 863493804..913aba95f 100644
--- a/doc/context/sources/general/manuals/math/math-features.tex
+++ b/doc/context/sources/general/manuals/math/math-features.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \usemodule[fonts-features]
diff --git a/doc/context/sources/general/manuals/math/math-framing-001.tex b/doc/context/sources/general/manuals/math/math-framing-001.tex
index 5081b8ad2..8203af611 100644
--- a/doc/context/sources/general/manuals/math/math-framing-001.tex
+++ b/doc/context/sources/general/manuals/math/math-framing-001.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \setuplayout[topspace=5mm,bottomspace=5mm,height=middle,header=1cm,footer=0cm]
 
 \starttext
diff --git a/doc/context/sources/general/manuals/math/math-framing.tex b/doc/context/sources/general/manuals/math/math-framing.tex
index b93d57f49..6cd5efbe3 100644
--- a/doc/context/sources/general/manuals/math/math-framing.tex
+++ b/doc/context/sources/general/manuals/math/math-framing.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-framing
diff --git a/doc/context/sources/general/manuals/math/math-fun.tex b/doc/context/sources/general/manuals/math/math-fun.tex
index f9d0fe844..baf74a261 100644
--- a/doc/context/sources/general/manuals/math/math-fun.tex
+++ b/doc/context/sources/general/manuals/math/math-fun.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-fun
diff --git a/doc/context/sources/general/manuals/math/math-grouping.tex b/doc/context/sources/general/manuals/math/math-grouping.tex
index cc79ff198..d28e26587 100644
--- a/doc/context/sources/general/manuals/math/math-grouping.tex
+++ b/doc/context/sources/general/manuals/math/math-grouping.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/math
 
 \environment math-layout
 
diff --git a/doc/context/sources/general/manuals/math/math-input.tex b/doc/context/sources/general/manuals/math/math-input.tex
index 9b14057d0..d5f75a1ac 100644
--- a/doc/context/sources/general/manuals/math/math-input.tex
+++ b/doc/context/sources/general/manuals/math/math-input.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/math
 
 \environment math-layout
 
diff --git a/doc/context/sources/general/manuals/math/math-introduction.tex b/doc/context/sources/general/manuals/math/math-introduction.tex
index de7c0a960..f8e15533b 100644
--- a/doc/context/sources/general/manuals/math/math-introduction.tex
+++ b/doc/context/sources/general/manuals/math/math-introduction.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-introduction
diff --git a/doc/context/sources/general/manuals/math/math-layout.tex b/doc/context/sources/general/manuals/math/math-layout.tex
index 81eb9da62..3695f9b56 100644
--- a/doc/context/sources/general/manuals/math/math-layout.tex
+++ b/doc/context/sources/general/manuals/math/math-layout.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \startenvironment math-layout
 
 \enabledirectives[fontgoodies.mathkerning]
diff --git a/doc/context/sources/general/manuals/math/math-mkiv.tex b/doc/context/sources/general/manuals/math/math-mkiv.tex
index a136e993b..91731d5fa 100644
--- a/doc/context/sources/general/manuals/math/math-mkiv.tex
+++ b/doc/context/sources/general/manuals/math/math-mkiv.tex
@@ -1,4 +1,6 @@
-% language=uk
+% language=us runpath=texruns:manuals/math
+
+% language=us
 
 % author    : Hans Hagen
 % copyright : PRAGMA ADE & ConTeXt Development Team
diff --git a/doc/context/sources/general/manuals/math/math-numbering.tex b/doc/context/sources/general/manuals/math/math-numbering.tex
index 1576e17bb..fc74cdb81 100644
--- a/doc/context/sources/general/manuals/math/math-numbering.tex
+++ b/doc/context/sources/general/manuals/math/math-numbering.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-numbering
diff --git a/doc/context/sources/general/manuals/math/math-oddities.tex b/doc/context/sources/general/manuals/math/math-oddities.tex
index 015a30126..33017ef95 100644
--- a/doc/context/sources/general/manuals/math/math-oddities.tex
+++ b/doc/context/sources/general/manuals/math/math-oddities.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/math
 
 \environment math-layout
 
diff --git a/doc/context/sources/general/manuals/math/math-spacing-001.tex b/doc/context/sources/general/manuals/math/math-spacing-001.tex
index a0ccda449..5c21be489 100644
--- a/doc/context/sources/general/manuals/math/math-spacing-001.tex
+++ b/doc/context/sources/general/manuals/math/math-spacing-001.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \doifmodeelse {with-struts} {
     \def\Line{\dontleavehmode{\showstruts\dorecurse{18}{x \strut x }}}
 } {
diff --git a/doc/context/sources/general/manuals/math/math-spacing.tex b/doc/context/sources/general/manuals/math/math-spacing.tex
index 913a90d9e..477e4c9fb 100644
--- a/doc/context/sources/general/manuals/math/math-spacing.tex
+++ b/doc/context/sources/general/manuals/math/math-spacing.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/math
 
 \environment math-layout
 
@@ -611,9 +611,9 @@ Math has its own direction control:
 
 \starttexdefinition unexpanded MathTest #1#2#3
     \ruledvbox \bgroup
-        \mathdir#1\relax
-        \textdir#2\relax
-        \pardir #3\relax
+        \mathdirection#1\relax
+        \textdirection#2\relax
+        \pardirection #3\relax
         \hsize=30mm
         \startformula
             a^2+b^2=c^2
@@ -629,14 +629,14 @@ Math has its own direction control:
 
 \startbuffer
 \startcombination[nx=4,ny=2,distance=1cm]
-    {\MathTest{TLT}{TLT}{TLT}} {\MathShow1{TLT}{TLT}{TLT}}
-    {\MathTest{TLT}{TLT}{TRT}} {\MathShow2{TLT}{TLT}{TRT}}
-    {\MathTest{TLT}{TRT}{TLT}} {\MathShow3{TLT}{TRT}{TLT}}
-    {\MathTest{TLT}{TRT}{TRT}} {\MathShow4{TLT}{TRT}{TRT}}
-    {\MathTest{TRT}{TLT}{TLT}} {\MathShow5{TRT}{TLT}{TLT}}
-    {\MathTest{TRT}{TLT}{TRT}} {\MathShow6{TRT}{TLT}{TRT}}
-    {\MathTest{TRT}{TRT}{TLT}} {\MathShow7{TRT}{TRT}{TLT}}
-    {\MathTest{TRT}{TRT}{TRT}} {\MathShow8{TRT}{TRT}{TRT}}
+    {\MathTest{0}{0}{0}} {\MathShow1{0}{0}{0}}
+    {\MathTest{0}{0}{1}} {\MathShow2{0}{0}{1}}
+    {\MathTest{0}{1}{0}} {\MathShow3{0}{1}{0}}
+    {\MathTest{0}{1}{1}} {\MathShow4{0}{1}{1}}
+    {\MathTest{1}{0}{0}} {\MathShow5{1}{0}{0}}
+    {\MathTest{1}{0}{1}} {\MathShow6{1}{0}{1}}
+    {\MathTest{1}{1}{0}} {\MathShow7{1}{1}{0}}
+    {\MathTest{1}{1}{1}} {\MathShow8{1}{1}{1}}
 \stopcombination
 \stopbuffer
 
diff --git a/doc/context/sources/general/manuals/math/math-suboptimal.tex b/doc/context/sources/general/manuals/math/math-suboptimal.tex
index 9f4e94730..42d705f08 100644
--- a/doc/context/sources/general/manuals/math/math-suboptimal.tex
+++ b/doc/context/sources/general/manuals/math/math-suboptimal.tex
@@ -1,3 +1,4 @@
+% language=us runpath=texruns:manuals/math
 \environment math-layout
 
 \startcomponent math-subtoptimal
diff --git a/doc/context/sources/general/manuals/math/math-titlepage.tex b/doc/context/sources/general/manuals/math/math-titlepage.tex
index 1d1ac306a..1d289bb1c 100644
--- a/doc/context/sources/general/manuals/math/math-titlepage.tex
+++ b/doc/context/sources/general/manuals/math/math-titlepage.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \startcomponent math-titlepage
 
 \startMPpage
diff --git a/doc/context/sources/general/manuals/math/math-tricks.tex b/doc/context/sources/general/manuals/math/math-tricks.tex
index 7efcec50b..c2748c230 100644
--- a/doc/context/sources/general/manuals/math/math-tricks.tex
+++ b/doc/context/sources/general/manuals/math/math-tricks.tex
@@ -1,3 +1,5 @@
+% language=us runpath=texruns:manuals/math
+
 \environment math-layout
 
 \startcomponent math-tricks
@@ -334,6 +336,8 @@ return {
 
 \startsection[title=Integrals]
 
+{\em This section needs to be adapted to extensible integrals.}
+
 A curious exception in the math system is the integral sign. Its companions are
 the summation and product signs, but integral has as extra property that it has a
 slant. In \LUATEX\ there is rather advanced control over how the (optional)
@@ -347,13 +351,12 @@ liking. One reason for this is that you might want a consistent size across
 formulas. Let's use the following setup:
 
 \startbuffer[setup]
-\setupmathextensible
+% \setupmathextensible
+\setupmathdelimiter
   [integral]
   [rightoffset=-1mu,
    exact=yes,
    factor=2]
-
-\let\int\integral
 \stopbuffer
 
 \typebuffer[setup]
@@ -376,8 +379,12 @@ We use the following exmaple:
 
 This renders as:
 
+\pushoverloadmode
+
 \dontleavehmode\hbox{\getbuffer[setup,demo]}
 
+\popoverloadmode
+
 \stopsection
 
 \startsection[title=Fancy fences]
diff --git a/doc/context/sources/general/manuals/tools/tools-mkiv.tex b/doc/context/sources/general/manuals/tools/tools-mkiv.tex
index b26145d37..7b2b22e40 100644
--- a/doc/context/sources/general/manuals/tools/tools-mkiv.tex
+++ b/doc/context/sources/general/manuals/tools/tools-mkiv.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=us runpath=texruns:manuals/tools
 
 % author    : Hans Hagen
 % copyright : PRAGMA ADE & ConTeXt Development Team
diff --git a/metapost/context/base/mpxl/mp-lmtx.mpxl b/metapost/context/base/mpxl/mp-lmtx.mpxl
index f06bb6991..9984ab805 100644
--- a/metapost/context/base/mpxl/mp-lmtx.mpxl
+++ b/metapost/context/base/mpxl/mp-lmtx.mpxl
@@ -1070,6 +1070,9 @@ def lmt_do_chart_start (expr what) =
     save width, height, distance, linewidth, labelgap, labelfraction, value, nofsamples, nofsamplesets ;
     save fillcolor, drawcolor, labelcolor, labelstyle, labelformat, labelstrut, labelanchor, colormode ;
     string fillcolor, drawcolor, labelcolor, labelstyle, labelformat, labelstrut, labelanchor, colormode ;
+    if hasparameter "sampleset" :
+        setluaparameter "what" "samples" (getparameter "sampleset") ;
+    fi ;
     height := getparameter "height" ;
     width := getparameter "width" ;
     distance := getparameter "distance" ;
diff --git a/metapost/context/base/mpxl/mp-luas.mpxl b/metapost/context/base/mpxl/mp-luas.mpxl
index 04526c061..00e7876a8 100644
--- a/metapost/context/base/mpxl/mp-luas.mpxl
+++ b/metapost/context/base/mpxl/mp-luas.mpxl
@@ -260,6 +260,7 @@ newscriptindex mfid_getparametertext     ; mfid_getparametertext     := scriptin
 newscriptindex mfid_applyparameters      ; mfid_applyparameters      := scriptindex "applyparameters" ;
 newscriptindex mfid_pushparameters       ; mfid_pushparameters       := scriptindex "pushparameters" ;
 newscriptindex mfid_popparameters        ; mfid_popparameters        := scriptindex "popparameters" ;
+newscriptindex mfid_setluaparameter      ; mfid_setluaparameter      := scriptindex "setluaparameter" ;
 
 def getparameters        = runscript mfid_getparameters        enddef ;
 def presetparameters     = runscript mfid_presetparameters     enddef ;
@@ -276,10 +277,11 @@ def getparametertext     = runscript mfid_getparametertext     enddef ;
 def applyparameters      = runscript mfid_applyparameters      enddef ;
 def pushparameters       = runscript mfid_pushparameters       enddef ;
 def popparameters        = runscript mfid_popparameters        enddef ;
+def setluaparameter      = runscript mfid_setluaparameter      enddef ;
 
 permanent getparameters, presetparameters, hasparameter, hasoption, getparameter, getparameterdefault,
     getparametercount, getmaxparametercount, getparameterpath, getparameterpen, getparametertext, % getparameteroption,
-    applyparameters, pushparameters, popparameters ;
+    applyparameters, pushparameters, popparameters, setluaparameter ;
 
 newscriptindex mfun_newrecord ; mfun_newrecord := scriptindex "newrecord" ;
 newscriptindex mfun_setrecord ; mfun_setrecord := scriptindex "setrecord" ;
diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index c3454309f..963afcec9 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -678,6 +678,7 @@ function scripts.context.run(ctxdata,filename)
     local a_purgeall      = getargument("purgeall")
     local a_purgeresult   = getargument("purgeresult")
     local a_global        = getargument("global")
+    local a_runpath       = getargument("runpath")
     local a_timing        = getargument("timing")
     local a_profile       = getargument("profile")
     local a_batchmode     = getargument("batchmode")
@@ -739,6 +740,31 @@ function scripts.context.run(ctxdata,filename)
                 formatfile, scriptfile = resolvers.locateformat(formatname)
             end
             --
+            local runpath = a_runpath or analysis.runpath
+            if type(runpath) == "string" and runpath ~= "" then
+                runpath = resolvers.resolve(runpath)
+                local currentdir = dir.current()
+                if not lfs.isdir(runpath) then
+                    if dir.makedirs(runpath) then
+                        report("runpath %a has been created",runpath)
+                    else
+                        report("error: runpath %a cannot be created",runpath)
+                        os.exit()
+                    end
+                end
+                if lfs.chdir(runpath) then
+                    report("changing to runpath %a",runpath)
+                else
+                    report("error: changing to runpath %a is impossible",runpath)
+                    os.exit()
+                end
+                environment.arguments.path    = currentdir
+                environment.arguments.runpath = runpath
+                if filepathpart(filename) == "." then
+                    filename = filebasename(filename)
+                end
+            end
+            --
             a_jithash       = validstring(a_jithash or analysis.jithash) or nil
             a_permitloadlib = a_permitloadlib or analysis.permitloadlib or nil
             --
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 7a00e7ffa..e35763c09 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -23736,7 +23736,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-pre"] = package.loaded["data-pre"] or true
 
--- original size: 5088, stripped down to: 3144
+-- original size: 5872, stripped down to: 3691
 
 if not modules then modules={} end modules ['data-pre']={
  version=1.001,
@@ -23745,6 +23745,7 @@ if not modules then modules={} end modules ['data-pre']={
  copyright="PRAGMA ADE / ConTeXt Development Team",
  license="see context related readme files"
 }
+local ipairs=ipairs
 local insert,remove=table.insert,table.remove
 local resolvers=resolvers
 local prefixes=resolvers.prefixes
@@ -23756,6 +23757,7 @@ local basename=file.basename
 local dirname=file.dirname
 local joinpath=file.join
 local isfile=lfs.isfile
+local isdir=lfs.isdir
 prefixes.environment=function(str)
  return cleanpath(expansion(str))
 end
@@ -23816,6 +23818,30 @@ prefixes.home=function(str)
  local pth=getenv('HOME')
  return cleanpath(str and joinpath(pth,str) or pth)
 end
+do
+ local tmppth
+ prefixes.temp=function(str)
+  if not tmppth then
+   for _,s in ipairs { "TMP","TEMP","TMPDIR","TEMPDIR" } do
+    tmppth=getenv(s)
+    if tmppth~="" and isdir(tmppth) then
+     break
+    end
+   end
+   if not tmppth or tmppth=="" then
+    tmppth="."
+   end
+  end
+  return cleanpath(str and joinpath(tmppth,str) or tmppth)
+ end
+ prefixes.texruns=function(str)
+  local pth=getenv('TEXRUNS')
+  if pth=="" then
+   pth=tmppth
+  end
+  return cleanpath(str and joinpath(pth,str) or pth)
+ end
+end
 prefixes.env=prefixes.environment
 prefixes.rel=prefixes.relative
 prefixes.loc=prefixes.locate
@@ -25895,8 +25921,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024686
--- stripped bytes    : 402153
+-- original bytes    : 1025470
+-- stripped bytes    : 402390
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 7a00e7ffa..e35763c09 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -23736,7 +23736,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-pre"] = package.loaded["data-pre"] or true
 
--- original size: 5088, stripped down to: 3144
+-- original size: 5872, stripped down to: 3691
 
 if not modules then modules={} end modules ['data-pre']={
  version=1.001,
@@ -23745,6 +23745,7 @@ if not modules then modules={} end modules ['data-pre']={
  copyright="PRAGMA ADE / ConTeXt Development Team",
  license="see context related readme files"
 }
+local ipairs=ipairs
 local insert,remove=table.insert,table.remove
 local resolvers=resolvers
 local prefixes=resolvers.prefixes
@@ -23756,6 +23757,7 @@ local basename=file.basename
 local dirname=file.dirname
 local joinpath=file.join
 local isfile=lfs.isfile
+local isdir=lfs.isdir
 prefixes.environment=function(str)
  return cleanpath(expansion(str))
 end
@@ -23816,6 +23818,30 @@ prefixes.home=function(str)
  local pth=getenv('HOME')
  return cleanpath(str and joinpath(pth,str) or pth)
 end
+do
+ local tmppth
+ prefixes.temp=function(str)
+  if not tmppth then
+   for _,s in ipairs { "TMP","TEMP","TMPDIR","TEMPDIR" } do
+    tmppth=getenv(s)
+    if tmppth~="" and isdir(tmppth) then
+     break
+    end
+   end
+   if not tmppth or tmppth=="" then
+    tmppth="."
+   end
+  end
+  return cleanpath(str and joinpath(tmppth,str) or tmppth)
+ end
+ prefixes.texruns=function(str)
+  local pth=getenv('TEXRUNS')
+  if pth=="" then
+   pth=tmppth
+  end
+  return cleanpath(str and joinpath(pth,str) or pth)
+ end
+end
 prefixes.env=prefixes.environment
 prefixes.rel=prefixes.relative
 prefixes.loc=prefixes.locate
@@ -25895,8 +25921,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024686
--- stripped bytes    : 402153
+-- original bytes    : 1025470
+-- stripped bytes    : 402390
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 7a00e7ffa..e35763c09 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -23736,7 +23736,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-pre"] = package.loaded["data-pre"] or true
 
--- original size: 5088, stripped down to: 3144
+-- original size: 5872, stripped down to: 3691
 
 if not modules then modules={} end modules ['data-pre']={
  version=1.001,
@@ -23745,6 +23745,7 @@ if not modules then modules={} end modules ['data-pre']={
  copyright="PRAGMA ADE / ConTeXt Development Team",
  license="see context related readme files"
 }
+local ipairs=ipairs
 local insert,remove=table.insert,table.remove
 local resolvers=resolvers
 local prefixes=resolvers.prefixes
@@ -23756,6 +23757,7 @@ local basename=file.basename
 local dirname=file.dirname
 local joinpath=file.join
 local isfile=lfs.isfile
+local isdir=lfs.isdir
 prefixes.environment=function(str)
  return cleanpath(expansion(str))
 end
@@ -23816,6 +23818,30 @@ prefixes.home=function(str)
  local pth=getenv('HOME')
  return cleanpath(str and joinpath(pth,str) or pth)
 end
+do
+ local tmppth
+ prefixes.temp=function(str)
+  if not tmppth then
+   for _,s in ipairs { "TMP","TEMP","TMPDIR","TEMPDIR" } do
+    tmppth=getenv(s)
+    if tmppth~="" and isdir(tmppth) then
+     break
+    end
+   end
+   if not tmppth or tmppth=="" then
+    tmppth="."
+   end
+  end
+  return cleanpath(str and joinpath(tmppth,str) or tmppth)
+ end
+ prefixes.texruns=function(str)
+  local pth=getenv('TEXRUNS')
+  if pth=="" then
+   pth=tmppth
+  end
+  return cleanpath(str and joinpath(pth,str) or pth)
+ end
+end
 prefixes.env=prefixes.environment
 prefixes.rel=prefixes.relative
 prefixes.loc=prefixes.locate
@@ -25895,8 +25921,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024686
--- stripped bytes    : 402153
+-- original bytes    : 1025470
+-- stripped bytes    : 402390
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 7a00e7ffa..e35763c09 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -23736,7 +23736,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-pre"] = package.loaded["data-pre"] or true
 
--- original size: 5088, stripped down to: 3144
+-- original size: 5872, stripped down to: 3691
 
 if not modules then modules={} end modules ['data-pre']={
  version=1.001,
@@ -23745,6 +23745,7 @@ if not modules then modules={} end modules ['data-pre']={
  copyright="PRAGMA ADE / ConTeXt Development Team",
  license="see context related readme files"
 }
+local ipairs=ipairs
 local insert,remove=table.insert,table.remove
 local resolvers=resolvers
 local prefixes=resolvers.prefixes
@@ -23756,6 +23757,7 @@ local basename=file.basename
 local dirname=file.dirname
 local joinpath=file.join
 local isfile=lfs.isfile
+local isdir=lfs.isdir
 prefixes.environment=function(str)
  return cleanpath(expansion(str))
 end
@@ -23816,6 +23818,30 @@ prefixes.home=function(str)
  local pth=getenv('HOME')
  return cleanpath(str and joinpath(pth,str) or pth)
 end
+do
+ local tmppth
+ prefixes.temp=function(str)
+  if not tmppth then
+   for _,s in ipairs { "TMP","TEMP","TMPDIR","TEMPDIR" } do
+    tmppth=getenv(s)
+    if tmppth~="" and isdir(tmppth) then
+     break
+    end
+   end
+   if not tmppth or tmppth=="" then
+    tmppth="."
+   end
+  end
+  return cleanpath(str and joinpath(tmppth,str) or tmppth)
+ end
+ prefixes.texruns=function(str)
+  local pth=getenv('TEXRUNS')
+  if pth=="" then
+   pth=tmppth
+  end
+  return cleanpath(str and joinpath(pth,str) or pth)
+ end
+end
 prefixes.env=prefixes.environment
 prefixes.rel=prefixes.relative
 prefixes.loc=prefixes.locate
@@ -25895,8 +25921,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024686
--- stripped bytes    : 402153
+-- original bytes    : 1025470
+-- stripped bytes    : 402390
 
 -- end library merge
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index c85382380..7a36f2d34 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2021.07.22 19:11}
+\newcontextversion{2021.07.23 18:50}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 4c02f23df..f03ce574b 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.07.22 19:11}
+\edef\contextversion{2021.07.23 18:50}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index bc2a91dcf..f1fa1e266 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.07.22 19:11}
+\newcontextversion{2021.07.23 18:50}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 061a6651d..c54db1589 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.07.22 19:11}
+\edef\contextversion{2021.07.23 18:50}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/data-pre.lua b/tex/context/base/mkiv/data-pre.lua
index f7df8b918..cab297d19 100644
--- a/tex/context/base/mkiv/data-pre.lua
+++ b/tex/context/base/mkiv/data-pre.lua
@@ -25,6 +25,8 @@ if not modules then modules = { } end modules ['data-pre'] = {
 -- version         : operating system version
 -- release         : operating system release
 
+
+local ipairs = ipairs
 local insert, remove = table.insert, table.remove
 
 local resolvers     = resolvers
@@ -40,6 +42,7 @@ local dirname       = file.dirname
 local joinpath      = file.join
 
 local isfile        = lfs.isfile
+local isdir         = lfs.isdir
 
 prefixes.environment = function(str)
     return cleanpath(expansion(str))
@@ -92,6 +95,8 @@ prefixes.pathname = function(str)
     return cleanpath(dirname((fullname ~= "" and fullname) or str))
 end
 
+-- we can actually freeze these
+
 prefixes.selfautoloc = function(str)
     local pth = getenv('SELFAUTOLOC')
     return cleanpath(str and joinpath(pth,str) or pth)
@@ -112,6 +117,34 @@ prefixes.home = function(str)
     return cleanpath(str and joinpath(pth,str) or pth)
 end
 
+do
+    local tmppth
+
+    prefixes.temp = function(str)
+        if not tmppth then
+            for _, s in ipairs { "TMP", "TEMP", "TMPDIR", "TEMPDIR" } do
+                tmppth = getenv(s)
+                if tmppth ~= "" and isdir(tmppth) then
+                    break
+                end
+            end
+            if not tmppth or tmppth == "" then
+                tmppth = "."
+            end
+        end
+        return cleanpath(str and joinpath(tmppth,str) or tmppth)
+    end
+
+    prefixes.texruns = function(str)
+        local pth = getenv('TEXRUNS')
+        if pth == "" then
+            pth = tmppth
+        end
+        return cleanpath(str and joinpath(pth,str) or pth)
+    end
+
+end
+
 prefixes.env  = prefixes.environment
 prefixes.rel  = prefixes.relative
 prefixes.loc  = prefixes.locate
diff --git a/tex/context/base/mkiv/grph-fil.lua b/tex/context/base/mkiv/grph-fil.lua
index b39807830..e40420125 100644
--- a/tex/context/base/mkiv/grph-fil.lua
+++ b/tex/context/base/mkiv/grph-fil.lua
@@ -42,13 +42,20 @@ end
 
 job.register('job.files.collected', tobesaved, initializer)
 
+-- When there is a runpath specified, we're already there, so then we only need to
+-- pass the orginal path. But we pass it because it will prevent prepending the
+-- current direction to the given name.
+
 local runner = sandbox.registerrunner {
     name     = "hashed context run",
     program  = "context",
-    template = [[%options% %filename%]],
+    template = [[%options% --path=%path% %filename%]],
+    template = [[%options% %?path: --path=%path% ?% %?runpath: --runpath=%runpath% ?% %filename%]],
     checkers = {
         options  = "string",
         filename = "readable",
+        path     = "string",
+        runpath  = "string",
     }
 }
 
@@ -90,7 +97,13 @@ function jobfiles.run(name,action)
             -- can be anything but we assume it gets checked by the sandbox
             os.execute(action)
         elseif ta == "table" then
+            local path    = action.path
+            local runpath = action.runpath
+            action.path    = environment.arguments.path
+            action.runpath = environment.arguments.runpath
             runner(action)
+            action.path    = path
+            action.runpath = runpath
         else
             report_run("processing file, no action given for processing %a",name)
         end
diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua
index c27dade9d..3789191f1 100644
--- a/tex/context/base/mkiv/grph-inc.lua
+++ b/tex/context/base/mkiv/grph-inc.lua
@@ -555,6 +555,11 @@ function figures.setpaths(locationset,pathlist)
             end
         end
     end
+    -- new
+    if environment.arguments.path then
+        table.insert(t,1,environment.arguments.path)
+    end
+    --
     figure_paths  = t
     last_pathlist = pathlist
     figures.paths = figure_paths
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index f049422bf..50ced6ead 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -36,6 +36,7 @@ return {
         "applyparameters",
         "pushparameters",
         "popparameters",
+        "setluaparameter",
         "definecolor",
         --
         "record", "newrecord", "setrecord", "getrecord",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 96866e655..6cc175fa2 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 8013acd66..95162e960 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 3fedf6b5b..c4718ba92 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.07.22 19:11}
+\newcontextversion{2021.07.23 18:50}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index b517cf7b9..c8c14a6b1 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.07.22 19:11}
+\immutable\edef\contextversion{2021.07.23 18:50}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/grph-inc.lmt b/tex/context/base/mkxl/grph-inc.lmt
index 4ac980682..d6cfb0d6c 100644
--- a/tex/context/base/mkxl/grph-inc.lmt
+++ b/tex/context/base/mkxl/grph-inc.lmt
@@ -555,6 +555,11 @@ function figures.setpaths(locationset,pathlist)
             end
         end
     end
+    -- new
+    if environment.arguments.path then
+        table.insert(t,1,environment.arguments.path)
+    end
+    --
     figure_paths  = t
     last_pathlist = pathlist
     figures.paths = figure_paths
diff --git a/tex/context/base/mkxl/mlib-lmt.lmt b/tex/context/base/mkxl/mlib-lmt.lmt
index 55485e5f8..61d390dc0 100644
--- a/tex/context/base/mkxl/mlib-lmt.lmt
+++ b/tex/context/base/mkxl/mlib-lmt.lmt
@@ -79,6 +79,9 @@ end
 function mp.lmt_svg_include()
     local labelfile = metapost.getparameter { "labelfile" }
     if labelfile and labelfile ~= "" then
+        labelfile = resolvers.findbinfile(labelfile)
+    end
+    if labelfile and labelfile ~= "" then
         local labels = table.load(labelfile) -- todo: same path as svg file
         if type(labels) == "table" then
             for i=1,#labels do
@@ -103,8 +106,9 @@ function mp.lmt_svg_include()
     end
     local filename = metapost.getparameter { "filename" }
     if filename and filename ~= "" then
+        local ok, data = resolvers.loadbinfile(filename)
         mpdirect ( metapost.svgtomp {
-            data     = io.loaddata(filename),
+            data     = data,
             remap    = true,
             colormap = colormap,
             id       = filename,
diff --git a/tex/context/base/mkxl/mlib-scn.lmt b/tex/context/base/mkxl/mlib-scn.lmt
index 6032fd861..56fdce0fb 100644
--- a/tex/context/base/mkxl/mlib-scn.lmt
+++ b/tex/context/base/mkxl/mlib-scn.lmt
@@ -550,7 +550,6 @@ local function getparameterdefault()
                      -- return injectnumeric(0)
                         return 0
                     else
-                    print("LAST",last)
                      -- return get(last)
                         return last
                     end
@@ -765,6 +764,30 @@ function metapost.setparameterset(namespace,t)
     namespaces[namespace] = t
 end
 
+function metapost.getparameterpreset(namespace,t)
+    return namespace and presets[namespace] or presets
+end
+
+local function setluaparameter()
+    local namespace = scanstring()
+    local name      = scanstring()
+    local value     = scanstring()
+    local code      = load("return " .. value)
+    if type(code) == "function" then
+        local result = code()
+        if result then
+            local data = namespace and namespaces[namespace] or namespaces
+            data[name] = result
+        else
+            report("no result from lua code: %s",value)
+        end
+    else
+        report("invalid lua code: %s",value)
+    end
+end
+
+registerdirect("setluaparameter", setluaparameter)
+
 -- This is an experiment for Alan and me.
 
 do
@@ -890,6 +913,15 @@ do
         end
     end
 
+    function metapost.setrecord(name,data)
+        if type(data) == "table" then
+            local index = names[name]
+            if index then
+                records[index] = data
+            end
+        end
+    end
+
     function metapost.runinternal(action,index,kind,name)
         if action == 0 then
             -- allocate
diff --git a/tex/context/base/mkxl/mlib-svg.lmt b/tex/context/base/mkxl/mlib-svg.lmt
index 3e6d68099..862bd1cad 100644
--- a/tex/context/base/mkxl/mlib-svg.lmt
+++ b/tex/context/base/mkxl/mlib-svg.lmt
@@ -1595,9 +1595,10 @@ do
             local filename = ref.filename
             local fragment = ref.fragment
             if filename and filename ~= "" then
-                if lfs.isfile(filename) then
-                    report("loading use file: %s",filename)
-                    local root = xml.load(filename)
+                local fullname = resolvers.findbinfile(filename)
+                if lfs.isfile(fullname) then
+                    report("loading use file: %s",fullname)
+                    local root = xml.load(fullname)
                     res = xmlfirst(root,"**[@id='"..fragment.."']")
                     if res then
                         xmlinheritattributes(res,c) -- tricky
@@ -3525,7 +3526,8 @@ do
     local bpfactor = number.dimenfactors.bp
 
     function metapost.includesvgfile(filename,offset) -- offset in sp
-        if lfs.isfile(filename) then
+        local fullname = resolvers.findbinfile(filename)
+        if lfs.isfile(fullname) then
             context.startMPcode("doublefun")
                 context('draw lmt_svg [ filename = "%s", offset = %N ] ;',filename,(offset or 0)*bpfactor)
             context.stopMPcode()
@@ -3553,8 +3555,9 @@ do
     function metapost.showsvgpage(data)
         local dd = data.data
         if not dd then
-            local fn = data.filename
-            dd = fn and table.load(fn)
+            local filename = data.filename
+            local fullname = filename and resolvers.findbinfile(filename)
+            dd = fullname and table.load(fullname)
         end
         if type(dd) == "table" then
             local comment = data.comment
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 3864fbc99..c7caa519a 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2021-07-22 19:11
+-- merge date  : 2021-07-23 18:50
 
 do -- begin closure to overcome local limits and interference
author	Hans Hagen <pragma@wxs.nl>	2021-07-23 19:46:04 +0200
committer	Context Git Mirror Bot <phg@phi-gamma.net>	2021-07-23 19:46:04 +0200
commit	c73351bc5e590d5a7ebd2b0f13f895a447d25794 (patch)
tree	4e2028329e2c0b63a7818463918397de328d6432
parent	ed85eb918354b77672bbe347c2afcfe2e0b6b7fb (diff)
download	context-c73351bc5e590d5a7ebd2b0f13f895a447d25794.tar.gz