2018-06-12 21:56:00

62 files changed, 1686 insertions, 365 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 985755951..c52afe3fa 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", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "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", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath" },
+ ["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", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "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", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset" },
  ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "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" },
 }
\ 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 6b49d1896..4e1109e05 100644
--- a/context/data/scite/context/scite-context-data-metafun.properties
+++ b/context/data/scite/context/scite-context-data-metafun.properties
@@ -61,7 +61,7 @@ eofill eoclip nofill fillup eofillup \
 area addbackground shadedup shadeddown shadedleft \
 shadedright sortlist copylist shapedlist listtocurves \
 listtolines listsize listlast uniquelist circularpath \
-squarepath linearpath 
+squarepath linearpath theoffset 
 
 keywordclass.metafun.internals=\
 nocolormodel greycolormodel graycolormodel rgbcolormodel \
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 985755951..c52afe3fa 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", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "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", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath" },
+ ["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", "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "property", "properties", "withproperties", "asgroup", "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", "fillup", "eofillup", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset" },
  ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "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" },
 }
\ No newline at end of file
diff --git a/doc/context/documents/general/manuals/onandon.pdf b/doc/context/documents/general/manuals/onandon.pdf
index 16eef6dc8..3195b7ebd 100644
--- a/doc/context/documents/general/manuals/onandon.pdf
+++ b/doc/context/documents/general/manuals/onandon.pdf
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index a68cb9e58..90cba6aa0 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index ffae25018..e71e915da 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index ab8ade821..420e8e191 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index bc5c76359..d46a25afd 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index 0ce7a392d..bc9865a4a 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
index 77e659396..1b69ce871 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
index 014333311..2a509cbc8 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-de.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index d7de7c0f3..46f5f836d 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index 1f6f4a782..e46eb02c5 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index 8efe2ed0e..ba5cedcdd 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
index 160d708aa..03dba05a3 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
index 842fbbbfa..0713fbad1 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 708705d08..ef605bd21 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index 48cfe1c2c..1f935a5f1 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/doc/context/scripts/mkiv/context.html b/doc/context/scripts/mkiv/context.html
index cb841477a..b8837c525 100644
--- a/doc/context/scripts/mkiv/context.html
+++ b/doc/context/scripts/mkiv/context.html
@@ -61,6 +61,7 @@
         <tr><th>--trackers</th><td>list</td><td>set tracker variables (show list with --showtrackers)</td></tr>
         <tr><th>--directives</th><td>list</td><td>set directive variables (show list with --showdirectives)</td></tr>
         <tr><th>--silent</th><td>list</td><td>disable logcatgories (show list with --showlogcategories)</td></tr>
+        <tr><th>--strip</th><td></td><td>strip Lua code (only meant for production where no errors are expected)</td></tr>
         <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when ----silent)</td></tr>
         <tr><th>--noconsole</th><td></td><td>disable logging to the console (logfile only)</td></tr>
         <tr><th>--purgeresult</th><td></td><td>purge result file before run</td></tr>
diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man
index 39882b77e..fc92dd7aa 100644
--- a/doc/context/scripts/mkiv/context.man
+++ b/doc/context/scripts/mkiv/context.man
@@ -65,6 +65,9 @@ set directive variables (show list with --showdirectives)
 .B --silent=list
 disable logcatgories (show list with --showlogcategories)
 .TP
+.B --strip
+strip Lua code (only meant for production where no errors are expected)
+.TP
 .B --errors=list
 show errors at the end of a run, quit when in list (also when ----silent)
 .TP
diff --git a/doc/context/scripts/mkiv/context.xml b/doc/context/scripts/mkiv/context.xml
index 9003b549a..c4d634443 100644
--- a/doc/context/scripts/mkiv/context.xml
+++ b/doc/context/scripts/mkiv/context.xml
@@ -70,6 +70,9 @@
                 <flag name="silent" value="list">
                     <short>disable logcatgories (show list with <ref name="showlogcategories"/>)</short>
                 </flag>
+                <flag name="strip">
+                    <short>strip Lua code (only meant for production where no errors are expected)</short>
+                </flag>
                 <flag name="errors" value="list">
                     <short>show errors at the end of a run, quit when in list (also when <ref name="--silent"/>)</short>
                 </flag>
diff --git a/doc/context/scripts/mkiv/mtx-context.html b/doc/context/scripts/mkiv/mtx-context.html
index cb841477a..b8837c525 100644
--- a/doc/context/scripts/mkiv/mtx-context.html
+++ b/doc/context/scripts/mkiv/mtx-context.html
@@ -61,6 +61,7 @@
         <tr><th>--trackers</th><td>list</td><td>set tracker variables (show list with --showtrackers)</td></tr>
         <tr><th>--directives</th><td>list</td><td>set directive variables (show list with --showdirectives)</td></tr>
         <tr><th>--silent</th><td>list</td><td>disable logcatgories (show list with --showlogcategories)</td></tr>
+        <tr><th>--strip</th><td></td><td>strip Lua code (only meant for production where no errors are expected)</td></tr>
         <tr><th>--errors</th><td>list</td><td>show errors at the end of a run, quit when in list (also when ----silent)</td></tr>
         <tr><th>--noconsole</th><td></td><td>disable logging to the console (logfile only)</td></tr>
         <tr><th>--purgeresult</th><td></td><td>purge result file before run</td></tr>
diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man
index 39882b77e..fc92dd7aa 100644
--- a/doc/context/scripts/mkiv/mtx-context.man
+++ b/doc/context/scripts/mkiv/mtx-context.man
@@ -65,6 +65,9 @@ set directive variables (show list with --showdirectives)
 .B --silent=list
 disable logcatgories (show list with --showlogcategories)
 .TP
+.B --strip
+strip Lua code (only meant for production where no errors are expected)
+.TP
 .B --errors=list
 show errors at the end of a run, quit when in list (also when ----silent)
 .TP
diff --git a/doc/context/scripts/mkiv/mtx-context.xml b/doc/context/scripts/mkiv/mtx-context.xml
index 9003b549a..c4d634443 100644
--- a/doc/context/scripts/mkiv/mtx-context.xml
+++ b/doc/context/scripts/mkiv/mtx-context.xml
@@ -70,6 +70,9 @@
                 <flag name="silent" value="list">
                     <short>disable logcatgories (show list with <ref name="showlogcategories"/>)</short>
                 </flag>
+                <flag name="strip">
+                    <short>strip Lua code (only meant for production where no errors are expected)</short>
+                </flag>
                 <flag name="errors" value="list">
                     <short>show errors at the end of a run, quit when in list (also when <ref name="--silent"/>)</short>
                 </flag>
diff --git a/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex b/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex
index fab22515e..da3d6fe46 100644
--- a/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex
+++ b/doc/context/sources/general/manuals/cld/cld-moreonfunctions.tex
@@ -173,24 +173,27 @@ example of why coding in \TEX\ makes sense as it looks more intuitive:
 \test{test 4 \test{test 5} test 6}
 \stoptyping
 
-There is also another mechanism available. In the next example the second
-argument is actually a string.
-
-\starttyping
-local nested = context.nested
-
-context.test("test 8",nested.test("test 9"),"test 10")
-\stoptyping
-
-There is a pitfall here: a nested context command needs to be flushed explicitly,
-so in the case of:
-
-\starttyping
-context.nested.test("test 9")
-\stoptyping
-
-a string is created but nothing ends up at the \TEX\ end. Flushing is up to you.
-Beware: \type {nested} only works with the regular \CONTEXT\ catcode regime.
+The \type {context.nested} variant is now an alias to \type {context.delayed} and
+no longer builds a string representation.
+
+% There is also another mechanism available. In the next example the second
+% argument is actually a string.
+%
+% \starttyping
+% local nested = context.nested
+%
+% context.test("test 8",nested.test("test 9"),"test 10")
+% \stoptyping
+%
+% There is a pitfall here: a nested context command needs to be flushed explicitly,
+% so in the case of:
+%
+% \starttyping
+% context.nested.test("test 9")
+% \stoptyping
+%
+% a string is created but nothing ends up at the \TEX\ end. Flushing is up to you.
+% Beware: \type {nested} only works with the regular \CONTEXT\ catcode regime.
 
 \stopsection
 
diff --git a/doc/context/sources/general/manuals/onandon/onandon-110.tex b/doc/context/sources/general/manuals/onandon/onandon-110.tex
index 78ec96588..e8b005f24 100644
--- a/doc/context/sources/general/manuals/onandon/onandon-110.tex
+++ b/doc/context/sources/general/manuals/onandon/onandon-110.tex
@@ -63,6 +63,30 @@ add up, but less that one thinks, especially when macros are already quite
 optimal. Also this runtime includes time normally used for running additional
 programs (e.g.\ for getting bibliographies right).
 
+It must be said that performance is not completely under our control. For
+instance, we have patched the \LUAJIT\ hash function because it favours \URL's
+and therefore favours hashing the middle of the string which is bad for our use
+as we are more interested in the (often unique) start of strings. We also
+compress the format which speeds up loading but not on the native windows 64~bit
+binary. At the time this writing the extra overhead is 2~seconds due to some
+suboptimal gzip handling; the cross compiled 64~bit mingw binaries that I use
+don't suffer from this. When I was testing the 32~bit binaries on the machine of
+a colleague, I was surprised to measure the following differences on a complex
+document with hundreds of \XML\ files, many images and a lot of manipulations.
+
+\starttabulate[||c|c|]
+\NC            \BC 1.08 with \LUA\ 5.2 \BC 1.09 with \LUA\ 5.3 \NC \NR
+\BC \LUATEX    \NC $21.5$              \NC $15.2$              \NC \NR
+\BC \LUAJITTEX \NC $10.7$              \NC $10.3$              \NC \NR
+\stoptabulate
+
+Now, these are just rough numbers but they demonstrate that the gap between
+\LUATEX\ and \LUAJITTEX\ is becoming less which is good because at this moment it
+looks like \LUAJIT\ will not catch up with \LUA\ 5.3 so at some point we might
+drop it. It will be interesting to see what \LUA\ 5.4 will bring as it offers an
+\ alternative garbage collector. And imagine that the regular \LUA\ virtual
+machine gets more optimized.
+
 You also have to take into account that having a browser open in the background
 of a \TEX\ run has way more impact than a few tenths of a second in \LUATEX\
 performance. The same is true for memory usage: why bother about \LUATEX\ taking
diff --git a/metapost/context/base/mpiv/mp-bare.mpiv b/metapost/context/base/mpiv/mp-bare.mpiv
index c6194b1ee..e995556c1 100644
--- a/metapost/context/base/mpiv/mp-bare.mpiv
+++ b/metapost/context/base/mpiv/mp-bare.mpiv
@@ -14,35 +14,7 @@
 if known context_bare : endinput ; fi ;
 boolean context_bare  ; context_bare := true ;
 
-numeric mfun_tt_w[], mfun_tt_h[], mfun_tt_d[] ;
-numeric mfun_tt_n ; mfun_tt_n := 0 ;
-picture mfun_tt_p ; mfun_tt_p := nullpicture ;
-picture mfun_tt_o ; mfun_tt_o := nullpicture ;
-picture mfun_tt_c ; mfun_tt_c := nullpicture ;
-
-if unknown mfun_trial_run :
-    boolean mfun_trial_run ;
-    mfun_trial_run := false ;
-fi ;
-
-if unknown mfun_first_run :
-    boolean mfun_first_run ;
-    mfun_first_run := true ;
-fi ;
-
-def mfun_reset_tex_texts =
-    mfun_tt_n := 0 ;
-    mfun_tt_p := nullpicture ;
-    mfun_tt_o := nullpicture ; % redundant
-    mfun_tt_c := nullpicture ; % redundant
-enddef ;
-
-def mfun_flush_tex_texts =
-    addto currentpicture also mfun_tt_p
-enddef ;
-
-extra_beginfig := extra_beginfig & "mfun_reset_tex_texts ;" ;
-extra_endfig   := "mfun_flush_tex_texts ; mfun_reset_tex_texts ; " & extra_endfig ;
+boolean mfun_use_one_pass ; mfun_use_one_pass := runscript("mp.print(metapost.use_one_pass)") ;
 
 vardef colordecimals primary c =
     if cmykcolor c  :
@@ -54,34 +26,122 @@ vardef colordecimals primary c =
     fi
 enddef ;
 
-vardef rawtextext(expr str) = % todo: avoid currentpicture
-    if str = "" :
-        nullpicture
-    else :
-        mfun_tt_n := mfun_tt_n + 1 ;
-        mfun_tt_c := nullpicture ;
-        if mfun_trial_run :
+if mfun_use_one_pass :
+
+    rgbcolor mfun_tt_r ;
+    numeric mfun_tt_n ; mfun_tt_n := 0 ;
+    picture mfun_tt_o ; mfun_tt_o := nullpicture ;
+    picture mfun_tt_c ; mfun_tt_c := nullpicture ;
+
+    def mfun_reset_tex_texts =
+        mfun_tt_n := 0 ;
+        mfun_tt_o := nullpicture ; % redundant
+        mfun_tt_c := nullpicture ; % redundant
+    enddef ;
+
+    def mfun_flush_tex_texts =
+    enddef ;
+
+    vardef rawtextext(expr s) =
+        if s = "" :
+            nullpicture
+        else :
+            mfun_tt_n := mfun_tt_n + 1 ;
+            mfun_tt_c := nullpicture ;
             mfun_tt_o := nullpicture ;
             addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
+            mfun_tt_r := runscript("mp.SomeText(" & decimal mfun_tt_n & "," & ditto & s & ditto & ")") ;
             addto mfun_tt_c doublepath unitsquare
-                withprescript "tx_number=" & decimal mfun_tt_n
-                withprescript "tx_stage=trial"
+                xscaled redpart mfun_tt_r
+                yscaled (greenpart mfun_tt_r + bluepart mfun_tt_r)
+                shifted (0,-bluepart mfun_tt_r)
+                withprescript "mf_object=text"
+                withprescript "tx_index=" & decimal mfun_tt_n
                 withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
-                withpostscript str ;
-            addto mfun_tt_p also mfun_tt_c ;
-        elseif known mfun_tt_d[mfun_tt_n] :
-            addto mfun_tt_c doublepath unitsquare
-                xscaled mfun_tt_w[mfun_tt_n]
-                yscaled (mfun_tt_h[mfun_tt_n] + mfun_tt_d[mfun_tt_n])
-                shifted (0,-mfun_tt_d[mfun_tt_n])
-                withprescript "tx_number=" & decimal mfun_tt_n
-                withprescript "tx_stage=final" ;
-        else :
-            addto mfun_tt_c doublepath unitsquare ; % unitpicture
-        fi ;
+            ;
+            mfun_tt_c
+        fi
+    enddef ;
+
+    vardef rawmadetext =
+        mfun_tt_n := mfun_tt_n + 1 ;
+        mfun_tt_c := nullpicture ;
+        mfun_tt_o := nullpicture ;
+        addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
+        mfun_tt_r := runscript("mp.MadeText(" & decimal mfun_tt_n & ")") ;
+        addto mfun_tt_c doublepath unitsquare
+            xscaled redpart mfun_tt_r
+            yscaled (greenpart mfun_tt_r + bluepart mfun_tt_r)
+            shifted (0,-bluepart mfun_tt_r)
+            withprescript "mf_object=text"
+            withprescript "tx_index=" & decimal mfun_tt_n
+            withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
+        ;
         mfun_tt_c
-    fi
-enddef ;
+    enddef ;
+
+else :
+
+    numeric mfun_tt_w[], mfun_tt_h[], mfun_tt_d[] ;
+    numeric mfun_tt_n ; mfun_tt_n := 0 ;
+    picture mfun_tt_p ; mfun_tt_p := nullpicture ;
+    picture mfun_tt_o ; mfun_tt_o := nullpicture ;
+    picture mfun_tt_c ; mfun_tt_c := nullpicture ;
+
+    if unknown mfun_trial_run :
+        boolean mfun_trial_run ;
+        mfun_trial_run := false ;
+    fi ;
+
+    if unknown mfun_first_run :
+        boolean mfun_first_run ;
+        mfun_first_run := true ;
+    fi ;
+
+    def mfun_reset_tex_texts =
+        mfun_tt_n := 0 ;
+        mfun_tt_p := nullpicture ;
+        mfun_tt_o := nullpicture ; % redundant
+        mfun_tt_c := nullpicture ; % redundant
+    enddef ;
+
+    def mfun_flush_tex_texts =
+        addto currentpicture also mfun_tt_p
+    enddef ;
+
+    vardef rawtextext(expr str) = % todo: avoid currentpicture
+        if str = "" :
+            nullpicture
+        else :
+            mfun_tt_n := mfun_tt_n + 1 ;
+            mfun_tt_c := nullpicture ;
+            if mfun_trial_run :
+                mfun_tt_o := nullpicture ;
+                addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
+                addto mfun_tt_c doublepath unitsquare
+                    withprescript "tx_number=" & decimal mfun_tt_n
+                    withprescript "tx_stage=trial"
+                    withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
+                    withpostscript str ;
+                addto mfun_tt_p also mfun_tt_c ;
+            elseif known mfun_tt_d[mfun_tt_n] :
+                addto mfun_tt_c doublepath unitsquare
+                    xscaled mfun_tt_w[mfun_tt_n]
+                    yscaled (mfun_tt_h[mfun_tt_n] + mfun_tt_d[mfun_tt_n])
+                    shifted (0,-mfun_tt_d[mfun_tt_n])
+                    withprescript "tx_number=" & decimal mfun_tt_n
+                    withprescript "tx_stage=final" ;
+            else :
+                addto mfun_tt_c doublepath unitsquare ; % unitpicture
+            fi ;
+            mfun_tt_c
+        fi
+    enddef ;
+
+fi ;
+
+extra_beginfig := extra_beginfig & "mfun_reset_tex_texts ;" ;
+extra_endfig   := "mfun_flush_tex_texts ; mfun_reset_tex_texts ; " & extra_endfig ;
 
 primarydef str infont name = % nasty hack
     if name = "" :
diff --git a/metapost/context/base/mpiv/mp-blob.mpiv b/metapost/context/base/mpiv/mp-blob.mpiv
index d2bdf741a..1d8a205f1 100644
--- a/metapost/context/base/mpiv/mp-blob.mpiv
+++ b/metapost/context/base/mpiv/mp-blob.mpiv
@@ -37,6 +37,7 @@ if mfun_use_one_pass :
             xscaled redpart mfun_blob_b
             yscaled (greenpart mfun_blob_b + bluepart mfun_blob_b)
             shifted (0,- bluepart mfun_blob_b)
+            withprescript "mf_object=texblob"
             withprescript "tb_blob=" & decimal lua.mp.blob_index(mfun_blob_n,n) ;
         mfun_blob_c
     enddef ;
@@ -50,6 +51,7 @@ else :
             xscaled redpart mfun_blob_b
             yscaled (greenpart mfun_blob_b + bluepart mfun_blob_b)
             shifted (0,- bluepart mfun_blob_b)
+            withprescript "mf_object=texblob"
             withprescript "tb_stage=inject"
             withprescript "tb_blob=" & decimal lua.mp.blob_index(mfun_blob_n,n) ;
         mfun_blob_c
@@ -125,6 +127,7 @@ if mfun_use_one_pass :
                 draw boundingbox currentpicture withpen pencircle scaled .25pt withcolor blue ;
             fi ;
             draw fullcircle scaled 100bp
+                withprescript "mf_object=followtext"
                 withprescript "ft_stage=final"
                 withprescript "ft_category=" & decimal mfun_blob_n ;
         )
@@ -137,6 +140,7 @@ else :
             mfun_blob_n := mfun_blob_n + 1 ;
             if mfun_trial_run :
                 draw fullcircle scaled 100bp
+                    withprescript "mf_object=followtext"
                     withprescript "ft_stage=trial"
                     withprescript "ft_category=" & decimal mfun_blob_n
                     withpostscript txt ;
@@ -196,6 +200,7 @@ else :
                     draw boundingbox currentpicture withpen pencircle scaled .25pt withcolor blue ;
                 fi ;
                 draw fullcircle scaled 100bp
+                    withprescript "mf_object=followtext"
                     withprescript "ft_stage=final"
                     withprescript "ft_category=" & decimal mfun_blob_n ;
             fi ;
diff --git a/metapost/context/base/mpiv/mp-grph.mpiv b/metapost/context/base/mpiv/mp-grph.mpiv
index 2fc000b9d..a2f710881 100644
--- a/metapost/context/base/mpiv/mp-grph.mpiv
+++ b/metapost/context/base/mpiv/mp-grph.mpiv
@@ -168,6 +168,7 @@ else :
     def mfun_no_graphic_text (expr t) text rest =
         currentgraphictext := currentgraphictext + 1 ;
         draw unitsquare
+            withprescript "mf_object=graphictext"
             withprescript "gt_stage=trial"
             withprescript "gt_index=" & decimal currentgraphictext
             withpostscript t
diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv
index 99928c81c..403b2d3ae 100644
--- a/metapost/context/base/mpiv/mp-mlib.mpiv
+++ b/metapost/context/base/mpiv/mp-mlib.mpiv
@@ -20,6 +20,12 @@ numeric LUATEXFUNCTIONALITY ; LUATEXFUNCTIONALITY := runscript("mp.print(LUATEXF
 
 boolean mfun_use_one_pass ; mfun_use_one_pass := runscript("mp.print(metapost.use_one_pass)") ;
 
+%D Objects:
+
+vardef isobject expr p =
+    lua.mp.isobject(prescriptpart p)
+enddef ;
+
 %D Color and transparency
 %D
 %D Separable:
@@ -201,6 +207,7 @@ if mfun_use_one_pass :
                 xscaled redpart mfun_tt_r
                 yscaled (greenpart mfun_tt_r + bluepart mfun_tt_r)
                 shifted (0,-bluepart mfun_tt_r)
+                withprescript "mf_object=text"
                 withprescript "tx_index=" & decimal mfun_tt_n
                 withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
             ;
@@ -218,6 +225,7 @@ if mfun_use_one_pass :
             xscaled redpart mfun_tt_r
             yscaled (greenpart mfun_tt_r + bluepart mfun_tt_r)
             shifted (0,-bluepart mfun_tt_r)
+            withprescript "mf_object=text"
             withprescript "tx_index=" & decimal mfun_tt_n
             withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
         ;
@@ -237,6 +245,7 @@ else :
                 mfun_tt_o := nullpicture ;
                 addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
                 addto mfun_tt_c doublepath unitsquare
+                    withprescript "mf_object=text"
                     withprescript "tx_number=" & decimal mfun_tt_n
                     withprescript "tx_stage=trial"
                     withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
@@ -251,6 +260,7 @@ else :
                     xscaled redpart mfun_tt_b
                     yscaled (greenpart mfun_tt_b + bluepart mfun_tt_b)
                     shifted (0,- bluepart mfun_tt_b)
+                    withprescript "mf_object=text"
                     withprescript "tx_number=" & decimal mfun_tt_n
                     withprescript "tx_stage=final" ;
             fi ;
@@ -281,6 +291,7 @@ vardef rawtexbox(expr category, name) =
             xscaled redpart mfun_tt_b
             yscaled (greenpart mfun_tt_b + bluepart mfun_tt_b)
             shifted (0,- bluepart mfun_tt_b)
+            withprescript "mf_object=box"
             withprescript "bx_category=" & if numeric category : decimal fi category
             withprescript "bx_name=" & if numeric name : decimal fi name ;
     fi
@@ -424,8 +435,6 @@ enddef ;
 
 plain_compatibility_data := plain_compatibility_data & "save label, thelabel ;" & "useplainlabels ;" ;
 
-% next comes own own:
-
 vardef thetextext@#(expr p,z) =
   % interim labeloffset := textextoffset ;
     if string p :
@@ -464,6 +473,7 @@ if mfun_use_one_pass :
             xscaled redpart mfun_tt_r
             yscaled (greenpart mfun_tt_r + bluepart mfun_tt_r)
             shifted (0,-bluepart mfun_tt_r)
+            withprescript "mf_object=text"
             withprescript "tx_index=" & decimal mfun_tt_n
             withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
         ;
@@ -484,6 +494,7 @@ else :
             mfun_tt_o := nullpicture ;
             addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
             addto mfun_tt_c doublepath unitsquare
+                withprescript "mf_object=text"
                 withprescript "tx_number=" & decimal mfun_tt_n
                 withprescript "tx_stage=trial"
                 withprescript "tx_color=" & colordecimals colorpart mfun_tt_o
@@ -507,6 +518,7 @@ else :
                 xscaled redpart mfun_tt_b
                 yscaled (greenpart mfun_tt_b + bluepart mfun_tt_b)
                 shifted (0,- bluepart mfun_tt_b)
+                withprescript "mf_object=text"
                 withprescript "tx_number=" & decimal mfun_tt_n
                 withprescript "tx_stage=final" ;
             % begin of fmt specific
@@ -557,11 +569,44 @@ vardef texbox@#(expr category, name) = % no draw here
     thetexbox@#(category,name,origin)
 enddef ;
 
+% vardef thelabel@#(expr p,z) =
+%     if string p :
+%         thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
+%     else :
+%         p shifted (z + labeloffset*mfun_laboff@# - (mfun_labxf@#*lrcorner p + mfun_labyf@#*ulcorner p + (1-mfun_labxf@#-mfun_labyf@#)*llcorner p))
+%     fi
+% enddef;
+
+vardef theoffset@#(expr z) =
+    if pair z :
+        z
+    elseif path z :
+        if mfun_laboff@# = origin :
+            center z
+        elseif cycle z :
+            ((center z         )--
+             (mfun_labxf@#*ulcorner z + mfun_labyf@#*lrcorner z + (1-mfun_labxf@#-mfun_labyf@#)*urcorner z))
+                intersectionpoint z
+        else :
+            ((center z)--
+             (mfun_labxf@#*ulcorner z + mfun_labyf@#*lrcorner z + (1-mfun_labxf@#-mfun_labyf@#)*urcorner z))
+                intersectionpoint (z--cycle)
+        fi
+    else : % picture
+        (mfun_labxf@#*ulcorner z + mfun_labyf@#*lrcorner z + (1-mfun_labxf@#-mfun_labyf@#)*urcorner z)
+    fi
+enddef;
+
 vardef thelabel@#(expr p,z) =
-    if string p :
+    if numeric p :
+        thelabel@#(decimal p)
+    elseif string p :
         thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
     else :
-        p shifted (z + labeloffset*mfun_laboff@# - (mfun_labxf@#*lrcorner p + mfun_labyf@#*ulcorner p + (1-mfun_labxf@#-mfun_labyf@#)*llcorner p))
+        p shifted (theoffset@#(z)
+            + labeloffset*mfun_laboff@#
+            - (mfun_labxf@#*lrcorner p + mfun_labyf@#*ulcorner p +
+                (1-mfun_labxf@#-mfun_labyf@#)*llcorner p))
     fi
 enddef;
 
@@ -1235,6 +1280,7 @@ else :
             if mfun_trial_run :
               % lua.mp.report("set outline text",currentoutlinetext);
                 normaldraw unitsquare
+                    withprescript "mf_object=outline"
                     withprescript "ot_stage=trial"
                     withprescript "ot_index=" & decimal currentoutlinetext
                     withprescript "ot_kind=" & kind
diff --git a/scripts/context/lua/mtx-context.xml b/scripts/context/lua/mtx-context.xml
index 9003b549a..c4d634443 100644
--- a/scripts/context/lua/mtx-context.xml
+++ b/scripts/context/lua/mtx-context.xml
@@ -70,6 +70,9 @@
                 <flag name="silent" value="list">
                     <short>disable logcatgories (show list with <ref name="showlogcategories"/>)</short>
                 </flag>
+                <flag name="strip">
+                    <short>strip Lua code (only meant for production where no errors are expected)</short>
+                </flag>
                 <flag name="errors" value="list">
                     <short>show errors at the end of a run, quit when in list (also when <ref name="--silent"/>)</short>
                 </flag>
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index f1f46a3e9..195f98afd 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -21401,7 +21401,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 9272, stripped down to: 7401
+-- original size: 9346, stripped down to: 7465
 
 if not modules then modules={} end modules ['luat-fmt']={
   version=1.001,
@@ -21449,6 +21449,9 @@ local function secondaryflags()
   if arguments.ansi then
     flags[#flags+1]="--c:ansi"
   end
+  if arguments.strip then
+    flags[#flags+1]="--c:strip"
+  end
   return concat(flags," ")
 end
 local template=[[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %dump% %redirect%]]
@@ -21637,8 +21640,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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 util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 889046
--- stripped bytes    : 321241
+-- original bytes    : 889120
+-- stripped bytes    : 321251
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index f1f46a3e9..195f98afd 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -21401,7 +21401,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 9272, stripped down to: 7401
+-- original size: 9346, stripped down to: 7465
 
 if not modules then modules={} end modules ['luat-fmt']={
   version=1.001,
@@ -21449,6 +21449,9 @@ local function secondaryflags()
   if arguments.ansi then
     flags[#flags+1]="--c:ansi"
   end
+  if arguments.strip then
+    flags[#flags+1]="--c:strip"
+  end
   return concat(flags," ")
 end
 local template=[[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %dump% %redirect%]]
@@ -21637,8 +21640,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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 util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 889046
--- stripped bytes    : 321241
+-- original bytes    : 889120
+-- stripped bytes    : 321251
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index f1f46a3e9..195f98afd 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -21401,7 +21401,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 9272, stripped down to: 7401
+-- original size: 9346, stripped down to: 7465
 
 if not modules then modules={} end modules ['luat-fmt']={
   version=1.001,
@@ -21449,6 +21449,9 @@ local function secondaryflags()
   if arguments.ansi then
     flags[#flags+1]="--c:ansi"
   end
+  if arguments.strip then
+    flags[#flags+1]="--c:strip"
+  end
   return concat(flags," ")
 end
 local template=[[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %dump% %redirect%]]
@@ -21637,8 +21640,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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 util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 889046
--- stripped bytes    : 321241
+-- original bytes    : 889120
+-- stripped bytes    : 321251
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index f1f46a3e9..195f98afd 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -21401,7 +21401,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["luat-fmt"] = package.loaded["luat-fmt"] or true
 
--- original size: 9272, stripped down to: 7401
+-- original size: 9346, stripped down to: 7465
 
 if not modules then modules={} end modules ['luat-fmt']={
   version=1.001,
@@ -21449,6 +21449,9 @@ local function secondaryflags()
   if arguments.ansi then
     flags[#flags+1]="--c:ansi"
   end
+  if arguments.strip then
+    flags[#flags+1]="--c:strip"
+  end
   return concat(flags," ")
 end
 local template=[[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %dump% %redirect%]]
@@ -21637,8 +21640,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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 util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 889046
--- stripped bytes    : 321241
+-- original bytes    : 889120
+-- stripped bytes    : 321251
 
 -- end library merge
 
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 241725efa..c5e1def0d 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{2018.06.11 12:05}
+\newcontextversion{2018.06.12 21:48}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 5ff255b8e..073bce83a 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{2018.06.11 12:05}
+\edef\contextversion{2018.06.12 21:48}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index 7cf1bc684..8b6120f48 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -1274,6 +1274,7 @@
 \setinterfaceconstant{vcompact}{vcompact}
 \setinterfaceconstant{vector}{vector}
 \setinterfaceconstant{veroffset}{veroffset}
+\setinterfaceconstant{vfactor}{vfactor}
 \setinterfaceconstant{vfil}{vfil}
 \setinterfaceconstant{viewerprefix}{viewerprefix}
 \setinterfaceconstant{voffset}{voffset}
diff --git a/tex/context/base/mkiv/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua
index 54048b52a..dabdbb9b0 100644
--- a/tex/context/base/mkiv/cldf-ini.lua
+++ b/tex/context/base/mkiv/cldf-ini.lua
@@ -1454,7 +1454,7 @@ do
 
     local function indexer(parent,k)
         local f = function(...)
-            local a = { ... }
+            local a = { ... } -- this also freezes ...
             return function()
              -- return context[k](unpack(a))
                 return core[k](unpack(a))
@@ -1479,46 +1479,48 @@ do
 
 end
 
-do
-
-    -- context.nested (todo: lines), creates strings
-
-    local nested = { }
-
-    local function indexer(parent,k) -- not ok when traced
-        local f = function(...)
-            local t, savedflush, n = { }, flush, 0
-            flush = function(c,f,s,...) -- catcodes are ignored
-                n = n + 1
-                t[n] = s and concat{f,s,...} or f -- optimized for #args == 1
-            end
-         -- context[k](...)
-            core[k](...)
-            flush = savedflush
-            return concat(t)
-        end
-        parent[k] = f
-        return f
-    end
-
-    local function caller(parent,...)
-        local t, savedflush, n = { }, flush, 0
-        flush = function(c,f,s,...) -- catcodes are ignored
-            n = n + 1
-            t[n] = s and concat{f,s,...} or f -- optimized for #args == 1
-        end
-     -- context(...)
-        defaultcaller(context,...)
-        flush = savedflush
-        return concat(t)
-    end
-
-    setmetatableindex(nested,indexer)
-    setmetatablecall (nested,caller)
-
-    context.nested = nested
+-- do
+--
+--     -- context.nested (todo: lines), creates strings
+--
+--     local nested = { }
+--
+--     local function indexer(parent,k) -- not ok when traced
+--         local f = function(...)
+--             local t, savedflush, n = { }, flush, 0
+--             flush = function(c,f,s,...) -- catcodes are ignored
+--                 n = n + 1
+--                 t[n] = s and concat{f,s,...} or f -- optimized for #args == 1
+--             end
+--          -- context[k](...)
+--             core[k](...)
+--             flush = savedflush
+--             return concat(t)
+--         end
+--         parent[k] = f
+--         return f
+--     end
+--
+--     local function caller(parent,...)
+--         local t, savedflush, n = { }, flush, 0
+--         flush = function(c,f,s,...) -- catcodes are ignored
+--             n = n + 1
+--             t[n] = s and concat{f,s,...} or f -- optimized for #args == 1
+--         end
+--      -- context(...)
+--         defaultcaller(context,...)
+--         flush = savedflush
+--         return concat(t)
+--     end
+--
+--     setmetatableindex(nested,indexer)
+--     setmetatablecall (nested,caller)
+--
+--     context.nested = nested
+--
+-- end
 
-end
+context.nested = context.delayed
 
 -- verbatim
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 17ace314b..3a9acfb13 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2018.06.11 12:05}
+\newcontextversion{2018.06.12 21:48}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 8842e4fc3..1e90175c8 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -42,7 +42,7 @@
 %D has to match \type {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2018.06.11 12:05}
+\edef\contextversion{2018.06.12 21:48}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/core-env.lua b/tex/context/base/mkiv/core-env.lua
index 23f7ca178..ea7bbcb8e 100644
--- a/tex/context/base/mkiv/core-env.lua
+++ b/tex/context/base/mkiv/core-env.lua
@@ -40,14 +40,27 @@ local systemmodes          = { }
 -- we could use the built-in tex.is[count|dimen|skip|toks] here but caching
 -- at the lua end is not that bad (and we need more anyway)
 
--- undefined: mode == 0 or cmdname = "undefined_cs"
-
 local cache = tokens.cache
 
 -- we can have a modes cache too
 
-local iftrue    = cache["iftrue"].mode
-local undefined = cache["*undefined*crap*"].mode -- is this ok?
+local iftrue        = cache["iftrue"].mode
+
+local dimencode     = cache["scratchdimen"]    .command
+local countcode     = cache["scratchcounter"]  .command
+local tokencode     = cache["scratchtoken"]    .command
+local skipcode      = cache["scratchskip"]     .command
+local muskipcode    = cache["scratchmuskip"]   .command
+----- attributecode = cache["scratchattribute"].command
+
+local types = {
+    [dimencode]     = "dimen",
+    [countcode]     = "count",
+    [tokencode]     = "token",
+    [skipcode]      = "skip",
+    [muskipcode]    = "muskip",
+ -- [attributecode] = "attribute",
+}
 
 setmetatableindex(texmodes, function(t,k)
     local m = modes[k]
@@ -55,16 +68,17 @@ setmetatableindex(texmodes, function(t,k)
         return m()
     elseif k then
         local n = "mode>" .. k
-        if cache[n].mode == 0 then
-            return false
-        else
+        if is_defined then
             rawset(modes,k, function() return texgetcount(n) == 1 end)
             return texgetcount(n) == 1 -- 2 is prevented
+        else
+            return false
         end
     else
         return false
     end
 end)
+
 setmetatablenewindex(texmodes, function(t,k)
     report_mode("you cannot set the %s named %a this way","mode",k)
 end)
@@ -75,11 +89,11 @@ setmetatableindex(texsystemmodes, function(t,k)
         return m()
     else
         local n = "mode>*" .. k
-        if cache[n].mode == 0 then
-            return false
-        else
+        if is_defined(n) then
             rawset(systemmodes,k,function() return texgetcount(n) == 1 end)
             return texgetcount(n) == 1 -- 2 is prevented
+        else
+            return false
         end
     end
 end)
@@ -118,22 +132,6 @@ setmetatablenewindex(texisdefined, function(t,k)
     -- just ignore
 end)
 
-local dimencode     = cache["scratchdimen"]    .command
-local countcode     = cache["scratchcounter"]  .command
-local tokencode     = cache["scratchtoken"]    .command
-local skipcode      = cache["scratchskip"]     .command
-local muskipcode    = cache["scratchmuskip"]   .command
----- attributecode = cache["scratchattribute"].command
-
-local types = {
-    [dimencode]     = "dimen",
-    [countcode]     = "count",
-    [tokencode]     = "token",
-    [skipcode]      = "skip",
-    [muskipcode]    = "muskip",
- -- [attributecode] = "attribute",
-}
-
 function tex.isdimen(name)
     local hit = cache[name]
     return hit.command == dimencode and hit.index or true
diff --git a/tex/context/base/mkiv/font-ott.lua b/tex/context/base/mkiv/font-ott.lua
index c9e2836d8..88da136ac 100644
--- a/tex/context/base/mkiv/font-ott.lua
+++ b/tex/context/base/mkiv/font-ott.lua
@@ -988,9 +988,13 @@ setmetatableindex(languages, function(t,k)
     return "dflt"
 end)
 
-setmetatablenewindex(languages, "ignore")
-setmetatablenewindex(baselines, "ignore")
-setmetatablenewindex(baselines, "ignore")
+if setmetatablenewindex then
+
+    setmetatablenewindex(languages, "ignore")
+    setmetatablenewindex(scripts,   "ignore")
+    setmetatablenewindex(baselines, "ignore")
+
+end
 
 local function resolve(t,k)
     if k then
@@ -1030,7 +1034,11 @@ local function assign(t,k,v)
     end
 end
 
-setmetatablenewindex(features, assign)
+if setmetatablenewindex then
+
+    setmetatablenewindex(features, assign)
+
+end
 
 local checkers = {
     rand = function(v)
diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index 63a51b4fc..f74c53e82 100644
--- a/tex/context/base/mkiv/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
@@ -49,6 +49,8 @@ end
 
 -- no file.* and utilities.parsers.* functions yet
 
+local strip = false if arg then for i=-1,#arg do if arg[i] == "--c:strip" then strip = true break end end end
+
 function lua.registercode(filename,options)
     local barename = gsub(filename,"%.[%a%d]+$","")
     if barename == filename then filename = filename .. ".lua" end
@@ -66,7 +68,11 @@ function lua.registercode(filename,options)
             if environment.initex then
                 local n = lua.lastbytecode + 1
                 bytedata[n] = { name = barename, options = opts }
-                setbytecode(n,code)
+                if strip or opts.strip then
+                    setbytecode(n,code,true)
+                else
+                    setbytecode(n,code)
+                end
                 lua.lastbytecode = n
             end
         elseif environment.initex then
diff --git a/tex/context/base/mkiv/luat-fmt.lua b/tex/context/base/mkiv/luat-fmt.lua
index 3e08a86f0..2abc47094 100644
--- a/tex/context/base/mkiv/luat-fmt.lua
+++ b/tex/context/base/mkiv/luat-fmt.lua
@@ -48,6 +48,9 @@ local function secondaryflags()
     if arguments.ansi then
         flags[#flags+1] = "--c:ansi"
     end
+    if arguments.strip then
+        flags[#flags+1] = "--c:strip"
+    end
     return concat(flags," ")
 end
 
diff --git a/tex/context/base/mkiv/meta-blb.lua b/tex/context/base/mkiv/meta-blb.lua
index 957af16ca..d3418199c 100644
--- a/tex/context/base/mkiv/meta-blb.lua
+++ b/tex/context/base/mkiv/meta-blb.lua
@@ -196,7 +196,12 @@ local function process(object,prescript,before,after)
 --     end
 end
 
-metapost.installplugin(reset,analyze,process)
+metapost.installplugin {
+    name    = "texblob",
+    reset   = reset,
+    analyze = analyze,
+    process = process,
+}
 
 -- Here follows an example of usage of the above: a more modern
 -- version of followokens (in meta-imp-txt.mkiv).
@@ -279,7 +284,7 @@ interfaces.implement {
     actions   = initialize,
 }
 
-local tb_reset, tb_analyze, tb_process  do
+local ft_reset, ft_analyze, ft_process  do
 
     if metapost.use_one_pass then
 
@@ -300,7 +305,7 @@ local tb_reset, tb_analyze, tb_process  do
             end
         }
 
-        tb_process = function(object,prescript,before,after)
+        ft_process = function(object,prescript,before,after)
             object.path    = false
             object.color   = false
             object.grouped = true
@@ -310,11 +315,11 @@ local tb_reset, tb_analyze, tb_process  do
 
     else
 
-        tb_reset = function()
+        ft_reset = function()
             -- nothing
         end
 
-        tb_analyze = function(object,prescript)
+        ft_analyze = function(object,prescript)
             if prescript.ft_stage == "trial" then
                 local ft_category = tonumber(prescript.ft_category)
                 if ft_category then
@@ -325,7 +330,7 @@ local tb_reset, tb_analyze, tb_process  do
             end
         end
 
-        tb_process = function(object,prescript,before,after)
+        ft_process = function(object,prescript,before,after)
             if prescript.ft_stage == "final" then
                 object.path    = false
                 object.color   = false
@@ -339,4 +344,9 @@ local tb_reset, tb_analyze, tb_process  do
 
 end
 
-metapost.installplugin(tb_reset,tb_analyze,tb_process)
+metapost.installplugin {
+    name    = "followtext",
+    reset   = ft_reset,
+    analyze = ft_analyze,
+    process = ft_process,
+}
diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua
index 675be15bc..543d04697 100644
--- a/tex/context/base/mkiv/mlib-lua.lua
+++ b/tex/context/base/mkiv/mlib-lua.lua
@@ -776,3 +776,17 @@ do
     end
 
 end
+
+do
+
+    -- a bit overkill: just a find(str,"mf_object=") can be enough
+
+    local p1      = P("mf_object=")
+    local p2      = lpeg.patterns.eol * p1
+    local pattern = (1-p2)^0 * p2 + p1
+
+    function mp.isobject(str)
+        mp.boolean(pattern and str ~= "" and lpegmatch(p,str))
+    end
+
+end
diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua
index 3d361f835..da1e9c4f7 100644
--- a/tex/context/base/mkiv/mlib-pps.lua
+++ b/tex/context/base/mkiv/mlib-pps.lua
@@ -842,10 +842,6 @@ local sequencers       = utilities.sequencers
 local appendgroup      = sequencers.appendgroup
 local appendaction     = sequencers.appendaction
 
-local resetter         = nil
-local analyzer         = nil
-local processor        = nil
-
 local resetteractions  = sequencers.new { arguments = "t" }
 local analyzeractions  = sequencers.new { arguments = "object,prescript" }
 local processoractions = sequencers.new { arguments = "object,prescript,before,after" }
@@ -914,7 +910,7 @@ end
 function metapost.resetplugins(t) -- intialize plugins, before figure
     if top.plugmode then
         outercolormodel = colors.currentmodel() -- currently overloads the one set at the tex end
-        resetter(t)
+        resetteractions.runner(t)
     end
 end
 
@@ -922,7 +918,7 @@ function metapost.analyzeplugins(object) -- each object (first pass)
     if top.plugmode then
         local prescript = object.prescript   -- specifications
         if prescript and #prescript > 0 then
-            analyzer(object,splitprescript(prescript) or {})
+            analyzeractions.runner(object,splitprescript(prescript) or {})
             return top.multipass
         end
     end
@@ -935,7 +931,7 @@ function metapost.processplugins(object) -- each object (second pass)
         if prescript and #prescript > 0 then
             local before = { }
             local after = { }
-            processor(object,splitprescript(prescript) or {},before,after)
+            processoractions.runner(object,splitprescript(prescript) or {},before,after)
             return #before > 0 and before, #after > 0 and after
         else
             local c = object.color
@@ -1850,31 +1846,21 @@ local ot_reset, ot_analyze, ot_process do
 
 end
 
--- definitions
-
-appendaction(resetteractions, "system",ot_reset)
-appendaction(resetteractions, "system",cl_reset)
-appendaction(resetteractions, "system",tx_reset)
-
-appendaction(processoractions,"system",ot_process)
-appendaction(processoractions,"system",gr_process)
+-- mf_object=<string>
 
-appendaction(analyzeractions, "system",ot_analyze)
-appendaction(analyzeractions, "system",tx_analyze)
-appendaction(analyzeractions, "system",gt_analyze)
+local p1      = P("mf_object=")
+local p2      = lpeg.patterns.eol * p1
+local pattern = (1-p2)^0 * p2 + p1
 
-appendaction(processoractions,"system",sh_process)
---          (processoractions,"system",gt_process)
-appendaction(processoractions,"system",bm_process)
-appendaction(processoractions,"system",tx_process)
-appendaction(processoractions,"system",bx_process)
-appendaction(processoractions,"system",ps_process)
-appendaction(processoractions,"system",fg_process)
-appendaction(processoractions,"system",tr_process) -- last, as color can be reset
-
-appendaction(processoractions,"system",la_process)
+function metapost.isobject(str)
+    return pattern and str ~= "" and lpegmatch(p,str) and true or false
+end
 
-function metapost.installplugin(reset,analyze,process)
+local function installplugin(specification)
+    local reset   = specification.reset
+    local analyze = specification.analyze
+    local process = specification.process
+    local object  = specification.object
     if reset then
         appendaction(resetteractions,"system",reset)
     end
@@ -1884,13 +1870,21 @@ function metapost.installplugin(reset,analyze,process)
     if process then
         appendaction(processoractions,"system",process)
     end
-    resetter  = resetteractions .runner
-    analyzer  = analyzeractions .runner
-    processor = processoractions.runner
 end
 
--- we're nice and set them already
+metapost.installplugin = installplugin
+
+-- definitions
 
-resetter  = resetteractions .runner
-analyzer  = analyzeractions .runner
-processor = processoractions.runner
+installplugin { name = "outline",      reset = ot_reset, analyze = ot_analyze, process = ot_process }
+installplugin { name = "color",        reset = cl_reset, analyze = cl_analyze, process = cl_process }
+installplugin { name = "text",         reset = tx_reset, analyze = tx_analyze, process = tx_process }
+installplugin { name = "group",        reset = gr_reset, analyze = gr_analyze, process = gr_process }
+installplugin { name = "graphictext",  reset = gt_reset, analyze = gt_analyze, process = gt_process }
+installplugin { name = "shade",        reset = sh_reset, analyze = sh_analyze, process = sh_process }
+installplugin { name = "bitmap",       reset = bm_reset, analyze = bm_analyze, process = bm_process }
+installplugin { name = "box",          reset = bx_reset, analyze = bx_analyze, process = bx_process }
+installplugin { name = "position",     reset = ps_reset, analyze = ps_analyze, process = ps_process }
+installplugin { name = "figure",       reset = fg_reset, analyze = fg_analyze, process = fg_process }
+installplugin { name = "layer",        reset = la_reset, analyze = la_analyze, process = la_process }
+installplugin { name = "transparency", reset = tr_reset, analyze = tr_analyze, process = tr_process }
diff --git a/tex/context/base/mkiv/mtx-context-listing.tex b/tex/context/base/mkiv/mtx-context-listing.tex
index f7c3d2868..29c4999ae 100644
--- a/tex/context/base/mkiv/mtx-context-listing.tex
+++ b/tex/context/base/mkiv/mtx-context-listing.tex
@@ -44,7 +44,7 @@
 }
 
 \setupbodyfont
-  [dejavu,11pt,tt,\getdocumentargument{bodyfont}] % dejavu is more complete
+  [dejavu,9pt,tt,\getdocumentargument{bodyfont}] % dejavu is more complete
 
 \setuptyping
   [lines=yes]
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index caac199de..c6b3a9377 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -145,5 +145,7 @@ return {
         "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist",
         --
         "circularpath", "squarepath", "linearpath",
+        --
+        "theoffset",
     },
 }
diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv
index 4c78dfd69..cb08fa14a 100644
--- a/tex/context/base/mkiv/spac-ver.mkiv
+++ b/tex/context/base/mkiv/spac-ver.mkiv
@@ -2420,13 +2420,14 @@
    \scratchwidth\dimexpr\wd\nextbox+\scratchdistance\relax
    \ifx\m_spac_hanging_location\v!right
      \hangindent\ifconditional\displaylefttoright-\fi\scratchwidth
-     \rlap{\hskip\dimexpr\hsize-\wd\nextbox\relax\box\nextbox}%
+     \rlap{\hskip\dimexpr\hsize-\leftskip-\wd\nextbox\relax\box\nextbox}% \leftskip is new
    \else
      \hangindent\ifconditional\displaylefttoright\else-\fi\scratchwidth
      \llap{\box\nextbox\hskip\scratchdistance}%
    \fi
    \ignorespaces}
 
+
 %D \macros
 %D   {startfixed}
 %D
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 8697305df..4a95efec4 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 5e4f1b448..bd1efee16 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-doc.lua b/tex/context/base/mkiv/strc-doc.lua
index 2de26ac64..80e41451e 100644
--- a/tex/context/base/mkiv/strc-doc.lua
+++ b/tex/context/base/mkiv/strc-doc.lua
@@ -18,6 +18,7 @@ if not modules then modules = { } end modules ['strc-doc'] = {
 local next, type, tonumber, select = next, type, tonumber, select
 local find, match = string.find, string.match
 local concat, fastcopy, insert, remove = table.concat, table.fastcopy, table.insert, table.remove
+local sortedhash, sortedkeys = table.sortedhash, table.sortedkeys
 local max, min = math.max, math.min
 local allocate, mark, accesstable = utilities.storage.allocate, utilities.storage.mark, utilities.tables.accesstable
 local setmetatableindex = table.setmetatableindex
@@ -42,6 +43,7 @@ local trace_sectioning    = false  trackers.register("structures.sectioning", fu
 local trace_detail        = false  trackers.register("structures.detail",     function(v) trace_detail     = v end)
 
 local report_structure    = logs.reporter("structure","sectioning")
+local report_used         = logs.reporter("structure")
 
 local context             = context
 local commands            = commands
@@ -972,6 +974,47 @@ function sections.getnumber(depth,what) -- redefined here
     context(askednumber)
 end
 
+-- maybe handy
+
+function sections.showstructure()
+
+    local tobesaved = structures.lists.tobesaved
+
+    if not tobesaved then
+        return
+    end
+
+    local levels = setmetatableindex("table")
+    local names  = setmetatableindex("table")
+
+    report_used()
+    report_used("sections")
+    for i=1,#tobesaved do
+        local si = tobesaved[i]
+        local md = si.metadata
+        if md and md.kind == "section" then
+            local level   = md.level
+            local name    = md.name
+            local numbers = si.numberdata.numbers
+            local  title  = si.titledata.title
+            report_used("  %i : %-10s %-20s %s",level,concat(numbers,"."),name,title)
+            levels[level][name] = true
+            names[name][level]  = true
+        end
+    end
+    report_used()
+    report_used("levels")
+    for level, list in sortedhash(levels) do
+        report_used("  %s : % t",level,sortedkeys(list))
+    end
+    report_used()
+    report_used("names")
+    for name, list in sortedhash(names) do
+        report_used("  %-10s : % t",name,sortedkeys(list))
+    end
+    report_used()
+end
+
 -- experimental
 
 local levels = { }
@@ -1042,6 +1085,7 @@ implement { name = "getsomefullstructurenumber", actions = sections.fullnumber,
 implement { name = "getspecificstructuretitle",  actions = sections.structuredata,   arguments = { "string", "'titledata.title'",false,"string" } }
 
 implement { name = "reportstructure",            actions = sections.reportstructure }
+implement { name = "showstructure",              actions = sections.showstructure }
 
 implement {
     name      = "registersection",
diff --git a/tex/context/base/mkiv/strc-sec.mkiv b/tex/context/base/mkiv/strc-sec.mkiv
index 4cc2c7bd6..82c6d7ea7 100644
--- a/tex/context/base/mkiv/strc-sec.mkiv
+++ b/tex/context/base/mkiv/strc-sec.mkiv
@@ -816,6 +816,17 @@
 \let\currentheadlevel   \!!zerocount
 \let\currentheadcounter \!!zerocount
 
+\let\strc_show_used\relax
+
+\installtextracker
+  {structures.showused}
+  {\let\strc_show_used\clf_showstructure}
+  {\let\strc_show_used\relax}
+
+\appendtoks
+    \strc_show_used
+\to \everystoptext
+
 \unexpanded\def\placeheadtext  {\dosingleempty\strc_sectioning_place_head_text  } % use with care
 \unexpanded\def\placeheadnumber{\dosingleempty\strc_sectioning_place_head_number} % use with care
 
diff --git a/tex/context/base/mkiv/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua
index dfdf854d0..43e2d80a3 100644
--- a/tex/context/base/mkiv/toks-ini.lua
+++ b/tex/context/base/mkiv/toks-ini.lua
@@ -315,6 +315,9 @@ if setinspector then
 end
 
 tokens.cache = table.setmetatableindex(function(t,k)
+    if not is_defined(k) then
+        set_macro(k,"","global")
+    end
     local v = create_token(k)
     t[k] = v
     return v
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index ab256770c..20a0b9e2f 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -1280,6 +1280,7 @@
 		<cd:constant name='vcompact' value='vcompact'/>
 		<cd:constant name='vector' value='vector'/>
 		<cd:constant name='veroffset' value='veroffset'/>
+		<cd:constant name='vfactor' value='vfactor'/>
 		<cd:constant name='vfil' value='vfil'/>
 		<cd:constant name='viewerprefix' value='viewerprefix'/>
 		<cd:constant name='voffset' value='voffset'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index ab8ade821..420e8e191 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 315413f0e..508b08da6 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-ext.lua b/tex/generic/context/luatex/luatex-fonts-ext.lua
index 4f475bf4b..215217953 100644
--- a/tex/generic/context/luatex/luatex-fonts-ext.lua
+++ b/tex/generic/context/luatex/luatex-fonts-ext.lua
@@ -151,11 +151,15 @@ registerafmfeature(specification)
 
 -- normalizer (generic only)
 
-otf.features.normalize = function(t)
-    if t.rand then
-        t.rand = "random"
+if not otf.features.normalize then
+
+    otf.features.normalize = function(t)
+        if t.rand then
+            t.rand = "random"
+        end
+        return t
     end
-    return t
+
 end
 
 -- bonus
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ae3761cce..4d19c4217 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  : 06/11/18 12:05:53
+-- merge date  : 06/12/18 21:48:58
 
 do -- begin closure to overcome local limits and interference
 
@@ -11160,151 +11160,6 @@ end -- closure
 
 do -- begin closure to overcome local limits and interference
 
-if not modules then modules={} end modules ['font-oti']={
-  version=1.001,
-  comment="companion to font-ini.mkiv",
-  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
-  copyright="PRAGMA ADE / ConTeXt Development Team",
-  license="see context related readme files"
-}
-local lower=string.lower
-local fonts=fonts
-local constructors=fonts.constructors
-local otf=constructors.handlers.otf
-local otffeatures=constructors.features.otf
-local registerotffeature=otffeatures.register
-local otftables=otf.tables or {}
-otf.tables=otftables
-local allocate=utilities.storage.allocate
-registerotffeature {
-  name="features",
-  description="initialization of feature handler",
-  default=true,
-}
-local function setmode(tfmdata,value)
-  if value then
-    tfmdata.properties.mode=lower(value)
-  end
-end
-otf.modeinitializer=setmode
-local function setlanguage(tfmdata,value)
-  if value then
-    local cleanvalue=lower(value)
-    local languages=otftables and otftables.languages
-    local properties=tfmdata.properties
-    if not languages then
-      properties.language=cleanvalue
-    elseif languages[value] then
-      properties.language=cleanvalue
-    else
-      properties.language="dflt"
-    end
-  end
-end
-local function setscript(tfmdata,value)
-  if value then
-    local cleanvalue=lower(value)
-    local scripts=otftables and otftables.scripts
-    local properties=tfmdata.properties
-    if not scripts then
-      properties.script=cleanvalue
-    elseif scripts[value] then
-      properties.script=cleanvalue
-    else
-      properties.script="dflt"
-    end
-  end
-end
-registerotffeature {
-  name="mode",
-  description="mode",
-  initializers={
-    base=setmode,
-    node=setmode,
-    plug=setmode,
-  }
-}
-registerotffeature {
-  name="language",
-  description="language",
-  initializers={
-    base=setlanguage,
-    node=setlanguage,
-    plug=setlanguage,
-  }
-}
-registerotffeature {
-  name="script",
-  description="script",
-  initializers={
-    base=setscript,
-    node=setscript,
-    plug=setscript,
-  }
-}
-otftables.featuretypes=allocate {
-  gpos_single="position",
-  gpos_pair="position",
-  gpos_cursive="position",
-  gpos_mark2base="position",
-  gpos_mark2ligature="position",
-  gpos_mark2mark="position",
-  gpos_context="position",
-  gpos_contextchain="position",
-  gsub_single="substitution",
-  gsub_multiple="substitution",
-  gsub_alternate="substitution",
-  gsub_ligature="substitution",
-  gsub_context="substitution",
-  gsub_contextchain="substitution",
-  gsub_reversecontextchain="substitution",
-  gsub_reversesub="substitution",
-}
-function otffeatures.checkeddefaultscript(featuretype,autoscript,scripts)
-  if featuretype=="position" then
-    local default=scripts.dflt
-    if default then
-      if autoscript=="position" or autoscript==true then
-        return default
-      else
-        report_otf("script feature %s not applied, enable default positioning")
-      end
-    else
-    end
-  elseif featuretype=="substitution" then
-    local default=scripts.dflt
-    if default then
-      if autoscript=="substitution" or autoscript==true then
-        return default
-      end
-    end
-  end
-end
-function otffeatures.checkeddefaultlanguage(featuretype,autolanguage,languages)
-  if featuretype=="position" then
-    local default=languages.dflt
-    if default then
-      if autolanguage=="position" or autolanguage==true then
-        return default
-      else
-        report_otf("language feature %s not applied, enable default positioning")
-      end
-    else
-    end
-  elseif featuretype=="substitution" then
-    local default=languages.dflt
-    if default then
-      if autolanguage=="substitution" or autolanguage==true then
-        return default
-      end
-    end
-  end
-end
-
-end -- closure
-
-do -- begin closure to overcome local limits and interference
-
 if not modules then modules={} end modules ['font-otr']={
   version=1.001,
   comment="companion to font-ini.mkiv",
@@ -13085,6 +12940,1199 @@ end -- closure
 
 do -- begin closure to overcome local limits and interference
 
+if not modules then modules={} end modules ['font-oti']={
+  version=1.001,
+  comment="companion to font-ini.mkiv",
+  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
+  copyright="PRAGMA ADE / ConTeXt Development Team",
+  license="see context related readme files"
+}
+local lower=string.lower
+local fonts=fonts
+local constructors=fonts.constructors
+local otf=constructors.handlers.otf
+local otffeatures=constructors.features.otf
+local registerotffeature=otffeatures.register
+local otftables=otf.tables or {}
+otf.tables=otftables
+local allocate=utilities.storage.allocate
+registerotffeature {
+  name="features",
+  description="initialization of feature handler",
+  default=true,
+}
+local function setmode(tfmdata,value)
+  if value then
+    tfmdata.properties.mode=lower(value)
+  end
+end
+otf.modeinitializer=setmode
+local function setlanguage(tfmdata,value)
+  if value then
+    local cleanvalue=lower(value)
+    local languages=otftables and otftables.languages
+    local properties=tfmdata.properties
+    if not languages then
+      properties.language=cleanvalue
+    elseif languages[value] then
+      properties.language=cleanvalue
+    else
+      properties.language="dflt"
+    end
+  end
+end
+local function setscript(tfmdata,value)
+  if value then
+    local cleanvalue=lower(value)
+    local scripts=otftables and otftables.scripts
+    local properties=tfmdata.properties
+    if not scripts then
+      properties.script=cleanvalue
+    elseif scripts[value] then
+      properties.script=cleanvalue
+    else
+      properties.script="dflt"
+    end
+  end
+end
+registerotffeature {
+  name="mode",
+  description="mode",
+  initializers={
+    base=setmode,
+    node=setmode,
+    plug=setmode,
+  }
+}
+registerotffeature {
+  name="language",
+  description="language",
+  initializers={
+    base=setlanguage,
+    node=setlanguage,
+    plug=setlanguage,
+  }
+}
+registerotffeature {
+  name="script",
+  description="script",
+  initializers={
+    base=setscript,
+    node=setscript,
+    plug=setscript,
+  }
+}
+otftables.featuretypes=allocate {
+  gpos_single="position",
+  gpos_pair="position",
+  gpos_cursive="position",
+  gpos_mark2base="position",
+  gpos_mark2ligature="position",
+  gpos_mark2mark="position",
+  gpos_context="position",
+  gpos_contextchain="position",
+  gsub_single="substitution",
+  gsub_multiple="substitution",
+  gsub_alternate="substitution",
+  gsub_ligature="substitution",
+  gsub_context="substitution",
+  gsub_contextchain="substitution",
+  gsub_reversecontextchain="substitution",
+  gsub_reversesub="substitution",
+}
+function otffeatures.checkeddefaultscript(featuretype,autoscript,scripts)
+  if featuretype=="position" then
+    local default=scripts.dflt
+    if default then
+      if autoscript=="position" or autoscript==true then
+        return default
+      else
+        report_otf("script feature %s not applied, enable default positioning")
+      end
+    else
+    end
+  elseif featuretype=="substitution" then
+    local default=scripts.dflt
+    if default then
+      if autoscript=="substitution" or autoscript==true then
+        return default
+      end
+    end
+  end
+end
+function otffeatures.checkeddefaultlanguage(featuretype,autolanguage,languages)
+  if featuretype=="position" then
+    local default=languages.dflt
+    if default then
+      if autolanguage=="position" or autolanguage==true then
+        return default
+      else
+        report_otf("language feature %s not applied, enable default positioning")
+      end
+    else
+    end
+  elseif featuretype=="substitution" then
+    local default=languages.dflt
+    if default then
+      if autolanguage=="substitution" or autolanguage==true then
+        return default
+      end
+    end
+  end
+end
+
+end -- closure
+
+do -- begin closure to overcome local limits and interference
+
+if not modules then modules={} end modules ["font-ott"]={
+  version=1.001,
+  comment="companion to font-ini.mkiv",
+  author="Hans Hagen, PRAGMA-ADE, Hasselt NL",
+  copyright="PRAGMA ADE / ConTeXt Development Team",
+  license="see context related readme files",
+}
+local type,next,tonumber,tostring,rawget,rawset=type,next,tonumber,tostring,rawget,rawset
+local gsub,lower,format,match,gmatch,find=string.gsub,string.lower,string.format,string.match,string.gmatch,string.find
+local sequenced=table.sequenced
+local is_boolean=string.is_boolean
+local setmetatableindex=table.setmetatableindex
+local setmetatablenewindex=table.setmetatablenewindex
+local allocate=utilities.storage.allocate
+local fonts=fonts
+local otf=fonts.handlers.otf
+local otffeatures=otf.features
+local tables=otf.tables or {}
+otf.tables=tables
+local statistics=otf.statistics or {}
+otf.statistics=statistics
+local scripts=allocate {
+  ["arab"]="arabic",
+  ["armi"]="imperial aramaic",
+  ["armn"]="armenian",
+  ["avst"]="avestan",
+  ["bali"]="balinese",
+  ["bamu"]="bamum",
+  ["batk"]="batak",
+  ["beng"]="bengali",
+  ["bng2"]="bengali variant 2",
+  ["bopo"]="bopomofo",
+  ["brah"]="brahmi",
+  ["brai"]="braille",
+  ["bugi"]="buginese",
+  ["buhd"]="buhid",
+  ["byzm"]="byzantine music",
+  ["cakm"]="chakma",
+  ["cans"]="canadian syllabics",
+  ["cari"]="carian",
+  ["cham"]="cham",
+  ["cher"]="cherokee",
+  ["copt"]="coptic",
+  ["cprt"]="cypriot syllabary",
+  ["cyrl"]="cyrillic",
+  ["deva"]="devanagari",
+  ["dev2"]="devanagari variant 2",
+  ["dsrt"]="deseret",
+  ["egyp"]="egyptian heiroglyphs",
+  ["ethi"]="ethiopic",
+  ["geor"]="georgian",
+  ["glag"]="glagolitic",
+  ["goth"]="gothic",
+  ["grek"]="greek",
+  ["gujr"]="gujarati",
+  ["gjr2"]="gujarati variant 2",
+  ["guru"]="gurmukhi",
+  ["gur2"]="gurmukhi variant 2",
+  ["hang"]="hangul",
+  ["hani"]="cjk ideographic",
+  ["hano"]="hanunoo",
+  ["hebr"]="hebrew",
+  ["ital"]="old italic",
+  ["jamo"]="hangul jamo",
+  ["java"]="javanese",
+  ["kali"]="kayah li",
+  ["kana"]="hiragana and katakana",
+  ["khar"]="kharosthi",
+  ["khmr"]="khmer",
+  ["knda"]="kannada",
+  ["knd2"]="kannada variant 2",
+  ["kthi"]="kaithi",
+  ["lana"]="tai tham",
+  ["lao" ]="lao",
+  ["latn"]="latin",
+  ["lepc"]="lepcha",
+  ["limb"]="limbu",
+  ["linb"]="linear b",
+  ["lisu"]="lisu",
+  ["lyci"]="lycian",
+  ["lydi"]="lydian",
+  ["mand"]="mandaic and mandaean",
+  ["math"]="mathematical alphanumeric symbols",
+  ["merc"]="meroitic cursive",
+  ["mero"]="meroitic hieroglyphs",
+  ["mlym"]="malayalam",
+  ["mlm2"]="malayalam variant 2",
+  ["mong"]="mongolian",
+  ["mtei"]="meitei Mayek",
+  ["musc"]="musical symbols",
+  ["mym2"]="myanmar variant 2",
+  ["mymr"]="myanmar",
+  ["nko" ]='n"ko',
+  ["ogam"]="ogham",
+  ["olck"]="ol chiki",
+  ["orkh"]="old turkic and orkhon runic",
+  ["orya"]="oriya",
+  ["ory2"]="odia variant 2",
+  ["osma"]="osmanya",
+  ["phag"]="phags-pa",
+  ["phli"]="inscriptional pahlavi",
+  ["phnx"]="phoenician",
+  ["prti"]="inscriptional parthian",
+  ["rjng"]="rejang",
+  ["runr"]="runic",
+  ["samr"]="samaritan",
+  ["sarb"]="old south arabian",
+  ["saur"]="saurashtra",
+  ["shaw"]="shavian",
+  ["shrd"]="sharada",
+  ["sinh"]="sinhala",
+  ["sora"]="sora sompeng",
+  ["sund"]="sundanese",
+  ["sylo"]="syloti nagri",
+  ["syrc"]="syriac",
+  ["tagb"]="tagbanwa",
+  ["takr"]="takri",
+  ["tale"]="tai le",
+  ["talu"]="tai lu",
+  ["taml"]="tamil",
+  ["tavt"]="tai viet",
+  ["telu"]="telugu",
+  ["tel2"]="telugu variant 2",
+  ["tfng"]="tifinagh",
+  ["tglg"]="tagalog",
+  ["thaa"]="thaana",
+  ["thai"]="thai",
+  ["tibt"]="tibetan",
+  ["tml2"]="tamil variant 2",
+  ["ugar"]="ugaritic cuneiform",
+  ["vai" ]="vai",
+  ["xpeo"]="old persian cuneiform",
+  ["xsux"]="sumero-akkadian cuneiform",
+  ["yi" ]="yi",
+}
+local languages=allocate {
+  ["aba" ]="abaza",
+  ["abk" ]="abkhazian",
+  ["ach" ]="acholi",
+  ["acr" ]="achi",
+  ["ady" ]="adyghe",
+  ["afk" ]="afrikaans",
+  ["afr" ]="afar",
+  ["agw" ]="agaw",
+  ["aio" ]="aiton",
+  ["aka" ]="akan",
+  ["als" ]="alsatian",
+  ["alt" ]="altai",
+  ["amh" ]="amharic",
+  ["ang" ]="anglo-saxon",
+  ["apph"]="phonetic transcription—americanist conventions",
+  ["ara" ]="arabic",
+  ["arg" ]="aragonese",
+  ["ari" ]="aari",
+  ["ark" ]="rakhine",
+  ["asm" ]="assamese",
+  ["ast" ]="asturian",
+  ["ath" ]="athapaskan",
+  ["avr" ]="avar",
+  ["awa" ]="awadhi",
+  ["aym" ]="aymara",
+  ["azb" ]="torki",
+  ["aze" ]="azerbaijani",
+  ["bad" ]="badaga",
+  ["bad0"]="banda",
+  ["bag" ]="baghelkhandi",
+  ["bal" ]="balkar",
+  ["ban" ]="balinese",
+  ["bar" ]="bavarian",
+  ["bau" ]="baulé",
+  ["bbc" ]="batak toba",
+  ["bbr" ]="berber",
+  ["bch" ]="bench",
+  ["bcr" ]="bible cree",
+  ["bdy" ]="bandjalang",
+  ["bel" ]="belarussian",
+  ["bem" ]="bemba",
+  ["ben" ]="bengali",
+  ["bgc" ]="haryanvi",
+  ["bgq" ]="bagri",
+  ["bgr" ]="bulgarian",
+  ["bhi" ]="bhili",
+  ["bho" ]="bhojpuri",
+  ["bik" ]="bikol",
+  ["bil" ]="bilen",
+  ["bis" ]="bislama",
+  ["bjj" ]="kanauji",
+  ["bkf" ]="blackfoot",
+  ["bli" ]="baluchi",
+  ["blk" ]="pa'o karen",
+  ["bln" ]="balante",
+  ["blt" ]="balti",
+  ["bmb" ]="bambara (bamanankan)",
+  ["bml" ]="bamileke",
+  ["bos" ]="bosnian",
+  ["bpy" ]="bishnupriya manipuri",
+  ["bre" ]="breton",
+  ["brh" ]="brahui",
+  ["bri" ]="braj bhasha",
+  ["brm" ]="burmese",
+  ["brx" ]="bodo",
+  ["bsh" ]="bashkir",
+  ["bti" ]="beti",
+  ["bts" ]="batak simalungun",
+  ["bug" ]="bugis",
+  ["cak" ]="kaqchikel",
+  ["cat" ]="catalan",
+  ["cbk" ]="zamboanga chavacano",
+  ["ceb" ]="cebuano",
+  ["cgg" ]="chiga",
+  ["cha" ]="chamorro",
+  ["che" ]="chechen",
+  ["chg" ]="chaha gurage",
+  ["chh" ]="chattisgarhi",
+  ["chi" ]="chichewa (chewa, nyanja)",
+  ["chk" ]="chukchi",
+  ["chk0"]="chuukese",
+  ["cho" ]="choctaw",
+  ["chp" ]="chipewyan",
+  ["chr" ]="cherokee",
+  ["chu" ]="chuvash",
+  ["chy" ]="cheyenne",
+  ["cmr" ]="comorian",
+  ["cop" ]="coptic",
+  ["cor" ]="cornish",
+  ["cos" ]="corsican",
+  ["cpp" ]="creoles",
+  ["cre" ]="cree",
+  ["crr" ]="carrier",
+  ["crt" ]="crimean tatar",
+  ["csb" ]="kashubian",
+  ["csl" ]="church slavonic",
+  ["csy" ]="czech",
+  ["ctg" ]="chittagonian",
+  ["cuk" ]="san blas kuna",
+  ["dan" ]="danish",
+  ["dar" ]="dargwa",
+  ["dax" ]="dayi",
+  ["dcr" ]="woods cree",
+  ["deu" ]="german",
+  ["dgo" ]="dogri",
+  ["dgr" ]="dogri",
+  ["dhg" ]="dhangu",
+  ["dhv" ]="divehi (dhivehi, maldivian)",
+  ["diq" ]="dimli",
+  ["div" ]="divehi (dhivehi, maldivian)",
+  ["djr" ]="zarma",
+  ["djr0"]="djambarrpuyngu",
+  ["dng" ]="dangme",
+  ["dnj" ]="dan",
+  ["dnk" ]="dinka",
+  ["dri" ]="dari",
+  ["duj" ]="dhuwal",
+  ["dun" ]="dungan",
+  ["dzn" ]="dzongkha",
+  ["ebi" ]="ebira",
+  ["ecr" ]="eastern cree",
+  ["edo" ]="edo",
+  ["efi" ]="efik",
+  ["ell" ]="greek",
+  ["emk" ]="eastern maninkakan",
+  ["eng" ]="english",
+  ["erz" ]="erzya",
+  ["esp" ]="spanish",
+  ["esu" ]="central yupik",
+  ["eti" ]="estonian",
+  ["euq" ]="basque",
+  ["evk" ]="evenki",
+  ["evn" ]="even",
+  ["ewe" ]="ewe",
+  ["fan" ]="french antillean",
+  ["fan0"]=" fang",
+  ["far" ]="persian",
+  ["fat" ]="fanti",
+  ["fin" ]="finnish",
+  ["fji" ]="fijian",
+  ["fle" ]="dutch (flemish)",
+  ["fne" ]="forest nenets",
+  ["fon" ]="fon",
+  ["fos" ]="faroese",
+  ["fra" ]="french",
+  ["frc" ]="cajun french",
+  ["fri" ]="frisian",
+  ["frl" ]="friulian",
+  ["frp" ]="arpitan",
+  ["fta" ]="futa",
+  ["ful" ]="fulah",
+  ["fuv" ]="nigerian fulfulde",
+  ["gad" ]="ga",
+  ["gae" ]="scottish gaelic (gaelic)",
+  ["gag" ]="gagauz",
+  ["gal" ]="galician",
+  ["gar" ]="garshuni",
+  ["gaw" ]="garhwali",
+  ["gez" ]="ge'ez",
+  ["gih" ]="githabul",
+  ["gil" ]="gilyak",
+  ["gil0"]="kiribati (gilbertese)",
+  ["gkp" ]="kpelle (guinea)",
+  ["glk" ]="gilaki",
+  ["gmz" ]="gumuz",
+  ["gnn" ]="gumatj",
+  ["gog" ]="gogo",
+  ["gon" ]="gondi",
+  ["grn" ]="greenlandic",
+  ["gro" ]="garo",
+  ["gua" ]="guarani",
+  ["guc" ]="wayuu",
+  ["guf" ]="gupapuyngu",
+  ["guj" ]="gujarati",
+  ["guz" ]="gusii",
+  ["hai" ]="haitian (haitian creole)",
+  ["hal" ]="halam",
+  ["har" ]="harauti",
+  ["hau" ]="hausa",
+  ["haw" ]="hawaiian",
+  ["hay" ]="haya",
+  ["haz" ]="hazaragi",
+  ["hbn" ]="hammer-banna",
+  ["her" ]="herero",
+  ["hil" ]="hiligaynon",
+  ["hin" ]="hindi",
+  ["hma" ]="high mari",
+  ["hmn" ]="hmong",
+  ["hmo" ]="hiri motu",
+  ["hnd" ]="hindko",
+  ["ho" ]="ho",
+  ["hri" ]="harari",
+  ["hrv" ]="croatian",
+  ["hun" ]="hungarian",
+  ["hye" ]="armenian",
+  ["hye0"]="armenian east",
+  ["iba" ]="iban",
+  ["ibb" ]="ibibio",
+  ["ibo" ]="igbo",
+  ["ido" ]="ido",
+  ["ijo" ]="ijo languages",
+  ["ile" ]="interlingue",
+  ["ilo" ]="ilokano",
+  ["ina" ]="interlingua",
+  ["ind" ]="indonesian",
+  ["ing" ]="ingush",
+  ["inu" ]="inuktitut",
+  ["ipk" ]="inupiat",
+  ["ipph"]="phonetic transcription—ipa conventions",
+  ["iri" ]="irish",
+  ["irt" ]="irish traditional",
+  ["isl" ]="icelandic",
+  ["ism" ]="inari sami",
+  ["ita" ]="italian",
+  ["iwr" ]="hebrew",
+  ["jam" ]="jamaican creole",
+  ["jan" ]="japanese",
+  ["jav" ]="javanese",
+  ["jbo" ]="lojban",
+  ["jii" ]="yiddish",
+  ["jud" ]="ladino",
+  ["jul" ]="jula",
+  ["kab" ]="kabardian",
+  ["kab0"]="kabyle",
+  ["kac" ]="kachchi",
+  ["kal" ]="kalenjin",
+  ["kan" ]="kannada",
+  ["kar" ]="karachay",
+  ["kat" ]="georgian",
+  ["kaz" ]="kazakh",
+  ["kde" ]="makonde",
+  ["kea" ]="kabuverdianu (crioulo)",
+  ["keb" ]="kebena",
+  ["kek" ]="kekchi",
+  ["kge" ]="khutsuri georgian",
+  ["kha" ]="khakass",
+  ["khk" ]="khanty-kazim",
+  ["khm" ]="khmer",
+  ["khs" ]="khanty-shurishkar",
+  ["kht" ]="khamti shan",
+  ["khv" ]="khanty-vakhi",
+  ["khw" ]="khowar",
+  ["kik" ]="kikuyu (gikuyu)",
+  ["kir" ]="kirghiz (kyrgyz)",
+  ["kis" ]="kisii",
+  ["kiu" ]="kirmanjki",
+  ["kjd" ]="southern kiwai",
+  ["kjp" ]="eastern pwo karen",
+  ["kkn" ]="kokni",
+  ["klm" ]="kalmyk",
+  ["kmb" ]="kamba",
+  ["kmn" ]="kumaoni",
+  ["kmo" ]="komo",
+  ["kms" ]="komso",
+  ["knr" ]="kanuri",
+  ["kod" ]="kodagu",
+  ["koh" ]="korean old hangul",
+  ["kok" ]="konkani",
+  ["kom" ]="komi",
+  ["kon" ]="kikongo",
+  ["kon0"]="kongo",
+  ["kop" ]="komi-permyak",
+  ["kor" ]="korean",
+  ["kos" ]="kosraean",
+  ["koz" ]="komi-zyrian",
+  ["kpl" ]="kpelle",
+  ["kri" ]="krio",
+  ["krk" ]="karakalpak",
+  ["krl" ]="karelian",
+  ["krm" ]="karaim",
+  ["krn" ]="karen",
+  ["krt" ]="koorete",
+  ["ksh" ]="kashmiri",
+  ["ksh0"]="ripuarian",
+  ["ksi" ]="khasi",
+  ["ksm" ]="kildin sami",
+  ["ksw" ]="s’gaw karen",
+  ["kua" ]="kuanyama",
+  ["kui" ]="kui",
+  ["kul" ]="kulvi",
+  ["kum" ]="kumyk",
+  ["kur" ]="kurdish",
+  ["kuu" ]="kurukh",
+  ["kuy" ]="kuy",
+  ["kyk" ]="koryak",
+  ["kyu" ]="western kayah",
+  ["lad" ]="ladin",
+  ["lah" ]="lahuli",
+  ["lak" ]="lak",
+  ["lam" ]="lambani",
+  ["lao" ]="lao",
+  ["lat" ]="latin",
+  ["laz" ]="laz",
+  ["lcr" ]="l-cree",
+  ["ldk" ]="ladakhi",
+  ["lez" ]="lezgi",
+  ["lij" ]="ligurian",
+  ["lim" ]="limburgish",
+  ["lin" ]="lingala",
+  ["lis" ]="lisu",
+  ["ljp" ]="lampung",
+  ["lki" ]="laki",
+  ["lma" ]="low mari",
+  ["lmb" ]="limbu",
+  ["lmo" ]="lombard",
+  ["lmw" ]="lomwe",
+  ["lom" ]="loma",
+  ["lrc" ]="luri",
+  ["lsb" ]="lower sorbian",
+  ["lsm" ]="lule sami",
+  ["lth" ]="lithuanian",
+  ["ltz" ]="luxembourgish",
+  ["lua" ]="luba-lulua",
+  ["lub" ]="luba-katanga",
+  ["lug" ]="ganda",
+  ["luh" ]="luyia",
+  ["luo" ]="luo",
+  ["lvi" ]="latvian",
+  ["mad" ]="madura",
+  ["mag" ]="magahi",
+  ["mah" ]="marshallese",
+  ["maj" ]="majang",
+  ["mak" ]="makhuwa",
+  ["mal" ]="malayalam reformed",
+  ["mam" ]="mam",
+  ["man" ]="mansi",
+  ["map" ]="mapudungun",
+  ["mar" ]="marathi",
+  ["maw" ]="marwari",
+  ["mbn" ]="mbundu",
+  ["mch" ]="manchu",
+  ["mcr" ]="moose cree",
+  ["mde" ]="mende",
+  ["mdr" ]="mandar",
+  ["men" ]="me'en",
+  ["mer" ]="meru",
+  ["mfe" ]="morisyen",
+  ["min" ]="minangkabau",
+  ["miz" ]="mizo",
+  ["mkd" ]="macedonian",
+  ["mkr" ]="makasar",
+  ["mkw" ]="kituba",
+  ["mle" ]="male",
+  ["mlg" ]="malagasy",
+  ["mln" ]="malinke",
+  ["mly" ]="malay",
+  ["mnd" ]="mandinka",
+  ["mng" ]="mongolian",
+  ["mni" ]="manipuri",
+  ["mnk" ]="maninka",
+  ["mnx" ]="manx",
+  ["moh" ]="mohawk",
+  ["mok" ]="moksha",
+  ["mol" ]="moldavian",
+  ["mon" ]="mon",
+  ["mor" ]="moroccan",
+  ["mos" ]="mossi",
+  ["mri" ]="maori",
+  ["mth" ]="maithili",
+  ["mts" ]="maltese",
+  ["mun" ]="mundari",
+  ["mus" ]="muscogee",
+  ["mwl" ]="mirandese",
+  ["mww" ]="hmong daw",
+  ["myn" ]="mayan",
+  ["mzn" ]="mazanderani",
+  ["nag" ]="naga-assamese",
+  ["nah" ]="nahuatl",
+  ["nan" ]="nanai",
+  ["nap" ]="neapolitan",
+  ["nas" ]="naskapi",
+  ["nau" ]="nauruan",
+  ["nav" ]="navajo",
+  ["ncr" ]="n-cree",
+  ["ndb" ]="ndebele",
+  ["ndc" ]="ndau",
+  ["ndg" ]="ndonga",
+  ["nds" ]="low saxon",
+  ["nep" ]="nepali",
+  ["new" ]="newari",
+  ["nga" ]="ngbaka",
+  ["ngr" ]="nagari",
+  ["nhc" ]="norway house cree",
+  ["nis" ]="nisi",
+  ["niu" ]="niuean",
+  ["nkl" ]="nyankole",
+  ["nko" ]="n'ko",
+  ["nld" ]="dutch",
+  ["noe" ]="nimadi",
+  ["nog" ]="nogai",
+  ["nor" ]="norwegian",
+  ["nov" ]="novial",
+  ["nsm" ]="northern sami",
+  ["nso" ]="sotho, northern",
+  ["nta" ]="northern tai",
+  ["nto" ]="esperanto",
+  ["nym" ]="nyamwezi",
+  ["nyn" ]="norwegian nynorsk",
+  ["oci" ]="occitan",
+  ["ocr" ]="oji-cree",
+  ["ojb" ]="ojibway",
+  ["ori" ]="odia",
+  ["oro" ]="oromo",
+  ["oss" ]="ossetian",
+  ["paa" ]="palestinian aramaic",
+  ["pag" ]="pangasinan",
+  ["pal" ]="pali",
+  ["pam" ]="pampangan",
+  ["pan" ]="punjabi",
+  ["pap" ]="palpa",
+  ["pap0"]="papiamentu",
+  ["pas" ]="pashto",
+  ["pau" ]="palauan",
+  ["pcc" ]="bouyei",
+  ["pcd" ]="picard",
+  ["pdc" ]="pennsylvania german",
+  ["pgr" ]="polytonic greek",
+  ["phk" ]="phake",
+  ["pih" ]="norfolk",
+  ["pil" ]="filipino",
+  ["plg" ]="palaung",
+  ["plk" ]="polish",
+  ["pms" ]="piemontese",
+  ["pnb" ]="western panjabi",
+  ["poh" ]="pocomchi",
+  ["pon" ]="pohnpeian",
+  ["pro" ]="provencal",
+  ["ptg" ]="portuguese",
+  ["pwo" ]="western pwo karen",
+  ["qin" ]="chin",
+  ["quc" ]="k’iche’",
+  ["quh" ]="quechua (bolivia)",
+  ["quz" ]="quechua",
+  ["qvi" ]="quechua (ecuador)",
+  ["qwh" ]="quechua (peru)",
+  ["raj" ]="rajasthani",
+  ["rar" ]="rarotongan",
+  ["rbu" ]="russian buriat",
+  ["rcr" ]="r-cree",
+  ["rej" ]="rejang",
+  ["ria" ]="riang",
+  ["rif" ]="tarifit",
+  ["rit" ]="ritarungo",
+  ["rkw" ]="arakwal",
+  ["rms" ]="romansh",
+  ["rmy" ]="vlax romani",
+  ["rom" ]="romanian",
+  ["roy" ]="romany",
+  ["rsy" ]="rusyn",
+  ["rtm" ]="rotuman",
+  ["rua" ]="kinyarwanda",
+  ["run" ]="rundi",
+  ["rup" ]="aromanian",
+  ["rus" ]="russian",
+  ["sad" ]="sadri",
+  ["san" ]="sanskrit",
+  ["sas" ]="sasak",
+  ["sat" ]="santali",
+  ["say" ]="sayisi",
+  ["scn" ]="sicilian",
+  ["sco" ]="scots",
+  ["sek" ]="sekota",
+  ["sel" ]="selkup",
+  ["sga" ]="old irish",
+  ["sgo" ]="sango",
+  ["sgs" ]="samogitian",
+  ["shi" ]="tachelhit",
+  ["shn" ]="shan",
+  ["sib" ]="sibe",
+  ["sid" ]="sidamo",
+  ["sig" ]="silte gurage",
+  ["sks" ]="skolt sami",
+  ["sky" ]="slovak",
+  ["sla" ]="slavey",
+  ["slv" ]="slovenian",
+  ["sml" ]="somali",
+  ["smo" ]="samoan",
+  ["sna" ]="sena",
+  ["sna0"]="shona",
+  ["snd" ]="sindhi",
+  ["snh" ]="sinhala (sinhalese)",
+  ["snk" ]="soninke",
+  ["sog" ]="sodo gurage",
+  ["sop" ]="songe",
+  ["sot" ]="sotho, southern",
+  ["sqi" ]="albanian",
+  ["srb" ]="serbian",
+  ["srd" ]="sardinian",
+  ["srk" ]="saraiki",
+  ["srr" ]="serer",
+  ["ssl" ]="south slavey",
+  ["ssm" ]="southern sami",
+  ["stq" ]="saterland frisian",
+  ["suk" ]="sukuma",
+  ["sun" ]="sundanese",
+  ["sur" ]="suri",
+  ["sva" ]="svan",
+  ["sve" ]="swedish",
+  ["swa" ]="swadaya aramaic",
+  ["swk" ]="swahili",
+  ["swz" ]="swati",
+  ["sxt" ]="sutu",
+  ["sxu" ]="upper saxon",
+  ["syl" ]="sylheti",
+  ["syr" ]="syriac",
+  ["szl" ]="silesian",
+  ["tab" ]="tabasaran",
+  ["taj" ]="tajiki",
+  ["tam" ]="tamil",
+  ["tat" ]="tatar",
+  ["tcr" ]="th-cree",
+  ["tdd" ]="dehong dai",
+  ["tel" ]="telugu",
+  ["tet" ]="tetum",
+  ["tgl" ]="tagalog",
+  ["tgn" ]="tongan",
+  ["tgr" ]="tigre",
+  ["tgy" ]="tigrinya",
+  ["tha" ]="thai",
+  ["tht" ]="tahitian",
+  ["tib" ]="tibetan",
+  ["tiv" ]="tiv",
+  ["tkm" ]="turkmen",
+  ["tmh" ]="tamashek",
+  ["tmn" ]="temne",
+  ["tna" ]="tswana",
+  ["tne" ]="tundra nenets",
+  ["tng" ]="tonga",
+  ["tod" ]="todo",
+  ["tod0"]="toma",
+  ["tpi" ]="tok pisin",
+  ["trk" ]="turkish",
+  ["tsg" ]="tsonga",
+  ["tua" ]="turoyo aramaic",
+  ["tul" ]="tulu",
+  ["tuv" ]="tuvin",
+  ["tvl" ]="tuvalu",
+  ["twi" ]="twi",
+  ["tyz" ]="tày",
+  ["tzm" ]="tamazight",
+  ["tzo" ]="tzotzil",
+  ["udm" ]="udmurt",
+  ["ukr" ]="ukrainian",
+  ["umb" ]="umbundu",
+  ["urd" ]="urdu",
+  ["usb" ]="upper sorbian",
+  ["uyg" ]="uyghur",
+  ["uzb" ]="uzbek",
+  ["vec" ]="venetian",
+  ["ven" ]="venda",
+  ["vit" ]="vietnamese",
+  ["vol" ]="volapük",
+  ["vro" ]="võro",
+  ["wa" ]="wa",
+  ["wag" ]="wagdi",
+  ["war" ]="waray-waray",
+  ["wcr" ]="west-cree",
+  ["wel" ]="welsh",
+  ["wlf" ]="wolof",
+  ["wln" ]="walloon",
+  ["xbd" ]="lü",
+  ["xhs" ]="xhosa",
+  ["xjb" ]="minjangbal",
+  ["xog" ]="soga",
+  ["xpe" ]="kpelle (liberia)",
+  ["yak" ]="sakha",
+  ["yao" ]="yao",
+  ["yap" ]="yapese",
+  ["yba" ]="yoruba",
+  ["ycr" ]="y-cree",
+  ["yic" ]="yi classic",
+  ["yim" ]="yi modern",
+  ["zea" ]="zealandic",
+  ["zgh" ]="standard morrocan tamazigh",
+  ["zha" ]="zhuang",
+  ["zhh" ]="chinese, hong kong sar",
+  ["zhp" ]="chinese phonetic",
+  ["zhs" ]="chinese simplified",
+  ["zht" ]="chinese traditional",
+  ["znd" ]="zande",
+  ["zul" ]="zulu",
+  ["zza" ]="zazaki",
+}
+local features=allocate {
+  ["aalt"]="access all alternates",
+  ["abvf"]="above-base forms",
+  ["abvm"]="above-base mark positioning",
+  ["abvs"]="above-base substitutions",
+  ["afrc"]="alternative fractions",
+  ["akhn"]="akhands",
+  ["blwf"]="below-base forms",
+  ["blwm"]="below-base mark positioning",
+  ["blws"]="below-base substitutions",
+  ["c2pc"]="petite capitals from capitals",
+  ["c2sc"]="small capitals from capitals",
+  ["calt"]="contextual alternates",
+  ["case"]="case-sensitive forms",
+  ["ccmp"]="glyph composition/decomposition",
+  ["cfar"]="conjunct form after ro",
+  ["cjct"]="conjunct forms",
+  ["clig"]="contextual ligatures",
+  ["cpct"]="centered cjk punctuation",
+  ["cpsp"]="capital spacing",
+  ["cswh"]="contextual swash",
+  ["curs"]="cursive positioning",
+  ["dflt"]="default processing",
+  ["dist"]="distances",
+  ["dlig"]="discretionary ligatures",
+  ["dnom"]="denominators",
+  ["dtls"]="dotless forms",
+  ["expt"]="expert forms",
+  ["falt"]="final glyph alternates",
+  ["fin2"]="terminal forms #2",
+  ["fin3"]="terminal forms #3",
+  ["fina"]="terminal forms",
+  ["flac"]="flattened accents over capitals",
+  ["frac"]="fractions",
+  ["fwid"]="full width",
+  ["half"]="half forms",
+  ["haln"]="halant forms",
+  ["halt"]="alternate half width",
+  ["hist"]="historical forms",
+  ["hkna"]="horizontal kana alternates",
+  ["hlig"]="historical ligatures",
+  ["hngl"]="hangul",
+  ["hojo"]="hojo kanji forms",
+  ["hwid"]="half width",
+  ["init"]="initial forms",
+  ["isol"]="isolated forms",
+  ["ital"]="italics",
+  ["jalt"]="justification alternatives",
+  ["jp04"]="jis2004 forms",
+  ["jp78"]="jis78 forms",
+  ["jp83"]="jis83 forms",
+  ["jp90"]="jis90 forms",
+  ["kern"]="kerning",
+  ["lfbd"]="left bounds",
+  ["liga"]="standard ligatures",
+  ["ljmo"]="leading jamo forms",
+  ["lnum"]="lining figures",
+  ["locl"]="localized forms",
+  ["ltra"]="left-to-right alternates",
+  ["ltrm"]="left-to-right mirrored forms",
+  ["mark"]="mark positioning",
+  ["med2"]="medial forms #2",
+  ["medi"]="medial forms",
+  ["mgrk"]="mathematical greek",
+  ["mkmk"]="mark to mark positioning",
+  ["mset"]="mark positioning via substitution",
+  ["nalt"]="alternate annotation forms",
+  ["nlck"]="nlc kanji forms",
+  ["nukt"]="nukta forms",
+  ["numr"]="numerators",
+  ["onum"]="old style figures",
+  ["opbd"]="optical bounds",
+  ["ordn"]="ordinals",
+  ["ornm"]="ornaments",
+  ["palt"]="proportional alternate width",
+  ["pcap"]="petite capitals",
+  ["pkna"]="proportional kana",
+  ["pnum"]="proportional figures",
+  ["pref"]="pre-base forms",
+  ["pres"]="pre-base substitutions",
+  ["pstf"]="post-base forms",
+  ["psts"]="post-base substitutions",
+  ["pwid"]="proportional widths",
+  ["qwid"]="quarter widths",
+  ["rand"]="randomize",
+  ["rclt"]="required contextual alternates",
+  ["rkrf"]="rakar forms",
+  ["rlig"]="required ligatures",
+  ["rphf"]="reph form",
+  ["rtbd"]="right bounds",
+  ["rtla"]="right-to-left alternates",
+  ["rtlm"]="right to left mirrored forms",
+  ["rvrn"]="required variation alternates",
+  ["ruby"]="ruby notation forms",
+  ["salt"]="stylistic alternates",
+  ["sinf"]="scientific inferiors",
+  ["size"]="optical size",
+  ["smcp"]="small capitals",
+  ["smpl"]="simplified forms",
+  ["ssty"]="script style",
+  ["stch"]="stretching glyph decomposition",
+  ["subs"]="subscript",
+  ["sups"]="superscript",
+  ["swsh"]="swash",
+  ["titl"]="titling",
+  ["tjmo"]="trailing jamo forms",
+  ["tnam"]="traditional name forms",
+  ["tnum"]="tabular figures",
+  ["trad"]="traditional forms",
+  ["twid"]="third widths",
+  ["unic"]="unicase",
+  ["valt"]="alternate vertical metrics",
+  ["vatu"]="vattu variants",
+  ["vert"]="vertical writing",
+  ["vhal"]="alternate vertical half metrics",
+  ["vjmo"]="vowel jamo forms",
+  ["vkna"]="vertical kana alternates",
+  ["vkrn"]="vertical kerning",
+  ["vpal"]="proportional alternate vertical metrics",
+  ["vrt2"]="vertical rotation",
+  ["zero"]="slashed zero",
+  ["trep"]="traditional tex replacements",
+  ["tlig"]="traditional tex ligatures",
+  ["ss.."]="stylistic set ..",
+  ["cv.."]="character variant ..",
+  ["js.."]="justification ..",
+  ["dv.."]="devanagari ..",
+  ["ml.."]="malayalam ..",
+}
+local baselines=allocate {
+  ["hang"]="hanging baseline",
+  ["icfb"]="ideographic character face bottom edge baseline",
+  ["icft"]="ideographic character face tope edige baseline",
+  ["ideo"]="ideographic em-box bottom edge baseline",
+  ["idtp"]="ideographic em-box top edge baseline",
+  ["math"]="mathematical centered baseline",
+  ["romn"]="roman baseline"
+}
+tables.scripts=scripts
+tables.languages=languages
+tables.features=features
+tables.baselines=baselines
+local acceptscripts=true directives.register("otf.acceptscripts",function(v) acceptscripts=v end)
+local acceptlanguages=true directives.register("otf.acceptlanguages",function(v) acceptlanguages=v end)
+local report_checks=logs.reporter("fonts","checks")
+if otffeatures.features then
+  for k,v in next,otffeatures.features do
+    features[k]=v
+  end
+  otffeatures.features=features
+end
+local function swapped(h)
+  local r={}
+  for k,v in next,h do
+    r[gsub(v,"[^a-z0-9]","")]=k 
+  end
+  return r
+end
+local verbosescripts=allocate(swapped(scripts ))
+local verboselanguages=allocate(swapped(languages))
+local verbosefeatures=allocate(swapped(features ))
+local verbosebaselines=allocate(swapped(baselines))
+local function resolve(t,k)
+  if k then
+    k=gsub(lower(k),"[^a-z0-9]","")
+    local v=rawget(t,k)
+    if v then
+      return v
+    end
+  end
+end
+setmetatableindex(verbosescripts,resolve)
+setmetatableindex(verboselanguages,resolve)
+setmetatableindex(verbosefeatures,resolve)
+setmetatableindex(verbosebaselines,resolve)
+setmetatableindex(scripts,function(t,k)
+  if k then
+    k=lower(k)
+    if k=="dflt" then
+      return k
+    end
+    local v=rawget(t,k)
+    if v then
+      return v
+    end
+    k=gsub(k," ","")
+    v=rawget(t,v)
+    if v then
+      return v
+    elseif acceptscripts then
+      report_checks("registering extra script %a",k)
+      rawset(t,k,k)
+      return k
+    end
+  end
+  return "dflt"
+end)
+setmetatableindex(languages,function(t,k)
+  if k then
+    k=lower(k)
+    if k=="dflt" then
+      return k
+    end
+    local v=rawget(t,k)
+    if v then
+      return v
+    end
+    k=gsub(k," ","")
+    v=rawget(t,v)
+    if v then
+      return v
+    elseif acceptlanguages then
+      report_checks("registering extra language %a",k)
+      rawset(t,k,k)
+      return k
+    end
+  end
+  return "dflt"
+end)
+if setmetatablenewindex then
+  setmetatablenewindex(languages,"ignore")
+  setmetatablenewindex(scripts,"ignore")
+  setmetatablenewindex(baselines,"ignore")
+end
+local function resolve(t,k)
+  if k then
+    k=lower(k)
+    local v=rawget(t,k)
+    if v then
+      return v
+    end
+    k=gsub(k," ","")
+    local v=rawget(t,k)
+    if v then
+      return v
+    end
+    local tag,dd=match(k,"(..)(%d+)")
+    if tag and dd then
+      local v=rawget(t,tag)
+      if v then
+        return v 
+      else
+        local v=rawget(t,tag.."..") 
+        if v then
+          return (gsub(v,"%.%.",tonumber(dd))) 
+        end
+      end
+    end
+  end
+  return k 
+end
+setmetatableindex(features,resolve)
+local function assign(t,k,v)
+  if k and v then
+    v=lower(v)
+    rawset(t,k,v)
+  end
+end
+if setmetatablenewindex then
+  setmetatablenewindex(features,assign)
+end
+local checkers={
+  rand=function(v)
+    return v==true and "random" or v
+  end
+}
+if not storage then
+  return
+end
+local usedfeatures=statistics.usedfeatures or {}
+statistics.usedfeatures=usedfeatures
+table.setmetatableindex(usedfeatures,function(t,k) if k then local v={} t[k]=v return v end end) 
+storage.register("fonts/otf/usedfeatures",usedfeatures,"fonts.handlers.otf.statistics.usedfeatures" )
+local normalizedaxis=otf.readers.helpers.normalizedaxis or function(s) return s end
+function otffeatures.normalize(features)
+  if features then
+    local h={}
+    for key,value in next,features do
+      local k=lower(key)
+      if k=="language" then
+        local v=gsub(lower(value),"[^a-z0-9]","")
+        h.language=rawget(verboselanguages,v) or (languages[v] and v) or "dflt" 
+      elseif k=="script" then
+        local v=gsub(lower(value),"[^a-z0-9]","")
+        h.script=rawget(verbosescripts,v) or (scripts[v] and v) or "dflt" 
+      elseif k=="axis" then
+        h[k]=normalizedaxis(value)
+        if not callbacks.supported.glyph_stream_provider then
+          h.variableshapes=true 
+        end
+      else
+        local uk=usedfeatures[key]
+        local uv=uk[value]
+        if uv then
+        else
+          uv=tonumber(value) 
+          if uv then
+          elseif type(value)=="string" then
+            local b=is_boolean(value)
+            if type(b)=="nil" then
+              uv=lower(value)
+            else
+              uv=b
+            end
+          elseif type(value)=="table" then
+            uv=sequenced(t,",")
+          else
+            uv=value
+          end
+          if not rawget(features,k) then
+            k=rawget(verbosefeatures,k) or k
+          end
+          local c=checkers[k]
+          if c then
+            uv=c(uv) or vc
+          end
+          uk[value]=uv
+        end
+        h[k]=uv
+      end
+    end
+    return h
+  end
+end
+
+end -- closure
+
+do -- begin closure to overcome local limits and interference
+
 if not modules then modules={} end modules ['font-cff']={
   version=1.001,
   comment="companion to font-ini.mkiv",
@@ -33386,11 +34434,13 @@ local specification={
 }
 registerotffeature(specification)
 registerafmfeature(specification)
-otf.features.normalize=function(t)
-  if t.rand then
-    t.rand="random"
+if not otf.features.normalize then
+  otf.features.normalize=function(t)
+    if t.rand then
+      t.rand="random"
+    end
+    return t
   end
-  return t
 end
 function fonts.helpers.nametoslot(name)
   local t=type(name)
diff --git a/tex/generic/context/luatex/luatex-fonts.lua b/tex/generic/context/luatex/luatex-fonts.lua
index b0f5aac3f..bef0b53a4 100644
--- a/tex/generic/context/luatex/luatex-fonts.lua
+++ b/tex/generic/context/luatex/luatex-fonts.lua
@@ -8,7 +8,7 @@ if not modules then modules = { } end modules ['luatex-fonts'] = {
 
 -- A merged file is generated with:
 --
---   mtxrun --script package --merge ./luatex-fonts.lua
+--   mtxrun --script package --merge luatex-fonts.lua
 --
 -- A needed resource file is made by:
 --
@@ -243,8 +243,9 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
 
         -- This is the bulk of opentype code.
 
-        loadmodule('font-oti.lua')
         loadmodule('font-otr.lua')
+        loadmodule('font-oti.lua')
+        loadmodule('font-ott.lua')
         loadmodule('font-cff.lua')
         loadmodule('font-ttf.lua')
         loadmodule('font-dsp.lua')