2019-09-10 20:11:00

49 files changed, 334 insertions, 153 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 5fa6ddc01..7d6256d54 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", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "keepcached", "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", "nodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex" },
- ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode" },
+ ["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", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "keepcached", "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", "dofill", "fillup", "eofillup", "nodraw", "dodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
 }
\ 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 318d7b773..2cdafa6e8 100644
--- a/context/data/scite/context/scite-context-data-metafun.properties
+++ b/context/data/scite/context/scite-context-data-metafun.properties
@@ -58,22 +58,22 @@ draworiginoptions drawboundoptions drawpathoptions resetdrawoptions undashed \
 pencilled decorated redecorated undecorated passvariable \
 passarrayvariable tostring topair format formatted \
 quotation quote startpassingvariable stoppassingvariable eofill \
-eoclip nofill fillup eofillup nodraw \
-area addbackground shadedup shadeddown shadedleft \
-shadedright sortlist copylist shapedlist listtocurves \
-listtolines listsize listlast uniquelist circularpath \
-squarepath linearpath theoffset texmode systemmode \
-texvar texstr isarray prefix dimension \
-getmacro getdimen getcount gettoks setmacro \
-setdimen setcount settoks positionpath positioncurve \
-positionxy positionpxy positionwhd positionpage positionregion \
-positionbox positionanchor positioninregion positionatanchor wdpart \
-htpart dppart texvar texstr inpath \
-pointof leftof rightof utflen utfsub \
-newhash disposehash inhash tohash isarray \
-prefix isobject comment report lua \
-mp MP luacall mirrored mirroredabout \
-scriptindex 
+eoclip nofill dofill fillup eofillup \
+nodraw dodraw area addbackground shadedup \
+shadeddown shadedleft shadedright sortlist copylist \
+shapedlist listtocurves listtolines listsize listlast \
+uniquelist circularpath squarepath linearpath theoffset \
+texmode systemmode texvar texstr isarray \
+prefix dimension getmacro getdimen getcount \
+gettoks setmacro setdimen setcount settoks \
+positionpath positioncurve positionxy positionpxy positionwhd \
+positionpage positionregion positionbox positionanchor positioninregion \
+positionatanchor wdpart htpart dppart texvar \
+texstr inpath pointof leftof rightof \
+utflen utfsub newhash disposehash inhash \
+tohash isarray prefix isobject comment \
+report lua mp MP luacall \
+mirrored mirroredabout scriptindex 
 
 keywordclass.metafun.internals=\
 nocolormodel greycolormodel graycolormodel rgbcolormodel \
@@ -83,5 +83,8 @@ colordodgetransparent colorburntransparent darkentransparent lightentransparent
 exclusiontransparent huetransparent saturationtransparent colortransparent luminositytransparent \
 ahvariant ahdimple ahfactor ahscale metapostversion \
 maxdimensions drawoptionsfactor dq sq crossingscale \
-crossingoption contextlmtxmode 
+crossingoption contextlmtxmode getparameters presetparameters hasparameter \
+hasoption getparameter getparameterdefault getparametercount getmaxparametercount \
+getparameterpath getparametertext applyparameters pushparameters popparameters \
+definecolor 
 
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 5fa6ddc01..7d6256d54 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", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "keepcached", "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", "nodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex" },
- ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode" },
+ ["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", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "notcached", "keepcached", "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", "dofill", "fillup", "eofillup", "nodraw", "dodraw", "area", "addbackground", "shadedup", "shadeddown", "shadedleft", "shadedright", "sortlist", "copylist", "shapedlist", "listtocurves", "listtolines", "listsize", "listlast", "uniquelist", "circularpath", "squarepath", "linearpath", "theoffset", "texmode", "systemmode", "texvar", "texstr", "isarray", "prefix", "dimension", "getmacro", "getdimen", "getcount", "gettoks", "setmacro", "setdimen", "setcount", "settoks", "positionpath", "positioncurve", "positionxy", "positionpxy", "positionwhd", "positionpage", "positionregion", "positionbox", "positionanchor", "positioninregion", "positionatanchor", "wdpart", "htpart", "dppart", "texvar", "texstr", "inpath", "pointof", "leftof", "rightof", "utflen", "utfsub", "newhash", "disposehash", "inhash", "tohash", "isarray", "prefix", "isobject", "comment", "report", "lua", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
 }
\ No newline at end of file
diff --git a/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json b/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
index d99045786..6eca349eb 100644
--- a/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
+++ b/context/data/vscode/extensions/context/syntaxes/context-syntax-mps.json
@@ -60,7 +60,7 @@
    "name" : "context.extra"
   },
   "helper" : {
-   "match" : "(zmod|ystretched|ysized|xysized|xyscaled|xstretched|xsized|withtransparency|withshadevector|withshadetransform|withshadestep|withshaderadius|withshadeorigin|withshademethod|withshadefraction|withshadefactor|withshadedomain|withshadedirection|withshadecolors|withshadecenter|withshade|withproperties|withmask|withlinearshade|withgrey|withgray|withcircularshade|whitecolor|wdpart|visualizepaths|visualizedfill|visualizeddraw|verbatim|utfsub|utflen|urtriangle|urmoved|urenlarged|urcircle|uptriangle|unspiked|unitvector|unittriangle|unitdiamond|unitcircle|uniquelist|undrawfill|undecorated|undashed|uncolored|ultriangle|ulmoved|ulenlarged|ulcircle|tripled|triangle|transparent|transparency|tostring|topenlarged|topboundary|topath|topair|tolist|tohash|tocycle|thetextext|thetexbox|theoffset|thelabel|texvar|texvar|textextoffset|textext|texstr|texstr|texmode|texbox|tensecircle|tcircle|tanh|tand|tan|systemmode|superellipsed|strut|stretched|straightpath|straightpairs|straightfunction|stoppassingvariable|startpassingvariable|squeezed|squarepath|sqr|spotcolor|space|sortlist|softened|snapped|smoothed|sized|sinh|sin|simplified|shownshadevector|shownshadeorigin|shortened|shapedlist|shadedup|shadedright|shadedleft|shadedinto|shadeddown|shaded|settoks|setmacro|setdimen|setcount|scriptindex|rule|roundedsquare|righttriangle|rightof|rightenlarged|rightboundary|rightarrow|resolvedcolor|resetdrawoptions|resetarrows|report|register|redecorated|readfile|rcircle|rawtextext|rawtexbox|randomshifted|randomizedcontrols|randomized|radian|quote|quotation|pushcurrentpicture|pushboundingbox|punked|property|properties|prefix|prefix|pow|positionxy|positionwhd|positionregion|positionpxy|positionpath|positionpage|positioninregion|positioncurve|positionbox|positionatanchor|positionanchor|popcurrentpicture|popboundingbox|pointof|pi|perpendicular|percent|penpoint|pencilled|peepholed|pathconnectors|passvariable|passarrayvariable|paralleled|paired|outsideof|outlinetexttopath|outlinetext|outerboundingbox|originpath|onlayer|oddly|nothing|notcached|normalfill|normaldraw|nofill|nodraw|newhash|naturalizepaths|namedcolor|multitonecolor|mp|mirroredabout|mirrored|luacall|lua|lrtriangle|lrmoved|lrenlarged|lrcircle|log|loadmodule|loadimage|loadfile|loadfigure|ln|lltriangle|llmoved|llenlarged|llcircle|listtolines|listtocurves|listsize|listlast|linearpath|lefttriangle|leftof|leftenlarged|leftboundary|leftarrow|lcircle|laddered|label|keepcached|istextext|isobject|isarray|isarray|invtan|invsin|inverted|invcos|inv|intersection_point|intersection_found|interpolated|insideof|inpath|innerboundingbox|inhash|infont|infinite|htpart|greyscale|greyed|grayscale|grayed|graphictext|gettoks|getmacro|getdimen|getcount|function|fulltriangle|fullsquare|fulldiamond|formatted|format|fillup|filloutlinetext|figure|externalfigure|exp|evenly|epsed|eofillup|eofill|eoclip|enlonged|enlarged|drawwholepath|drawpoints|drawpointoptions|drawpointlabels|drawpoint|drawpathoptions|drawpathonly|drawpath|drawoutlinetext|draworiginoptions|draworigin|drawlineoptions|drawlabeloptions|drawfill|drawdoublearrows|drawcontrolpoints|drawcontroloptions|drawcontrollines|drawboundoptions|drawboundingbox|drawboundary|dquote|dppart|downtriangle|disposehash|dispose|dimension|detailpaths|detaileddraw|defineshade|decorated|ddecimal|dddecimal|ddddecimal|cutends|curvedpath|curvedpairs|curvedfunction|curved|crossingunder|crossed|crlf|cotd|cot|cosh|cos|cornered|copylist|constructedpath|constructedpairs|constructedfunction|condition|complemented|complementary|comment|colortype|colorpart|colorlike|colordecimalslist|colordecimals|cmyk|clearxy|circularpath|checkedbounds|checkbounds|centerarrow|center|break|boundingradius|boundingpoint|boundingcircle|boundingbox|bottomenlarged|bottomboundary|blownup|blackcolor|bitmapimage|bcircle|bbwidth|bbheight|basiccolors|autoalign|atan|asinh|asin|asgroup|arrowpath|area|anchored|along|addbackground|acosh|acos|SPACE|PERCENT|MP|DQUOTE|CRLF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
+   "match" : "(zmod|ystretched|ysized|xysized|xyscaled|xstretched|xsized|withtransparency|withshadevector|withshadetransform|withshadestep|withshaderadius|withshadeorigin|withshademethod|withshadefraction|withshadefactor|withshadedomain|withshadedirection|withshadecolors|withshadecenter|withshade|withproperties|withmask|withlinearshade|withgrey|withgray|withcircularshade|whitecolor|wdpart|visualizepaths|visualizedfill|visualizeddraw|verbatim|utfsub|utflen|urtriangle|urmoved|urenlarged|urcircle|uptriangle|unspiked|unitvector|unittriangle|unitdiamond|unitcircle|uniquelist|undrawfill|undecorated|undashed|uncolored|ultriangle|ulmoved|ulenlarged|ulcircle|tripled|triangle|transparent|transparency|tostring|topenlarged|topboundary|topath|topair|tolist|tohash|tocycle|thetextext|thetexbox|theoffset|thelabel|texvar|texvar|textextoffset|textext|texstr|texstr|texmode|texbox|tensecircle|tcircle|tanh|tand|tan|systemmode|superellipsed|strut|stretched|straightpath|straightpairs|straightfunction|stoppassingvariable|startpassingvariable|squeezed|squarepath|sqr|spotcolor|space|sortlist|softened|snapped|smoothed|sized|sinh|sin|simplified|shownshadevector|shownshadeorigin|shortened|shapedlist|shadedup|shadedright|shadedleft|shadedinto|shadeddown|shaded|settoks|setmacro|setdimen|setcount|scriptindex|rule|roundedsquare|righttriangle|rightof|rightenlarged|rightboundary|rightarrow|resolvedcolor|resetdrawoptions|resetarrows|report|register|redecorated|readfile|rcircle|rawtextext|rawtexbox|randomshifted|randomizedcontrols|randomized|radian|quote|quotation|pushcurrentpicture|pushboundingbox|punked|property|properties|prefix|prefix|pow|positionxy|positionwhd|positionregion|positionpxy|positionpath|positionpage|positioninregion|positioncurve|positionbox|positionatanchor|positionanchor|popcurrentpicture|popboundingbox|pointof|pi|perpendicular|percent|penpoint|pencilled|peepholed|pathconnectors|passvariable|passarrayvariable|paralleled|paired|outsideof|outlinetexttopath|outlinetext|outerboundingbox|originpath|onlayer|oddly|nothing|notcached|normalfill|normaldraw|nofill|nodraw|newhash|naturalizepaths|namedcolor|multitonecolor|mp|mirroredabout|mirrored|luacall|lua|lrtriangle|lrmoved|lrenlarged|lrcircle|log|loadmodule|loadimage|loadfile|loadfigure|ln|lltriangle|llmoved|llenlarged|llcircle|listtolines|listtocurves|listsize|listlast|linearpath|lefttriangle|leftof|leftenlarged|leftboundary|leftarrow|lcircle|laddered|label|keepcached|istextext|isobject|isarray|isarray|invtan|invsin|inverted|invcos|inv|intersection_point|intersection_found|interpolated|insideof|inpath|innerboundingbox|inhash|infont|infinite|htpart|greyscale|greyed|grayscale|grayed|graphictext|gettoks|getmacro|getdimen|getcount|function|fulltriangle|fullsquare|fulldiamond|formatted|format|fillup|filloutlinetext|figure|externalfigure|exp|evenly|epsed|eofillup|eofill|eoclip|enlonged|enlarged|drawwholepath|drawpoints|drawpointoptions|drawpointlabels|drawpoint|drawpathoptions|drawpathonly|drawpath|drawoutlinetext|draworiginoptions|draworigin|drawlineoptions|drawlabeloptions|drawfill|drawdoublearrows|drawcontrolpoints|drawcontroloptions|drawcontrollines|drawboundoptions|drawboundingbox|drawboundary|dquote|dppart|downtriangle|dofill|dodraw|disposehash|dispose|dimension|detailpaths|detaileddraw|defineshade|decorated|ddecimal|dddecimal|ddddecimal|cutends|curvedpath|curvedpairs|curvedfunction|curved|crossingunder|crossed|crlf|cotd|cot|cosh|cos|cornered|copylist|constructedpath|constructedpairs|constructedfunction|condition|complemented|complementary|comment|colortype|colorpart|colorlike|colordecimalslist|colordecimals|cmyk|clearxy|circularpath|checkedbounds|checkbounds|centerarrow|center|break|boundingradius|boundingpoint|boundingcircle|boundingbox|bottomenlarged|bottomboundary|blownup|blackcolor|bitmapimage|bcircle|bbwidth|bbheight|basiccolors|autoalign|atan|asinh|asin|asgroup|arrowpath|area|anchored|along|addbackground|acosh|acos|SPACE|PERCENT|MP|DQUOTE|CRLF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
    "name" : "context.command.metafun.helper.mps"
   },
   "identifier" : {
@@ -138,7 +138,7 @@
    "name" : "context.string.string.text.mps"
   },
   "shortcut" : {
-   "match" : "(textextoffset|textextanchor|squared|sq|softlighttransparent|shadefactor|screentransparent|saturationtransparent|rounded|rgbcolormodel|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|normaltransparent|nocolormodel|multiplytransparent|mitered|metapostversion|maxdimensions|luminositytransparent|lightentransparent|labeloffset|join_radius|infinity|huetransparent|hardlighttransparent|greycolormodel|graycolormodel|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|defaultscale|defaultpen|darkentransparent|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|butt|beveled|bboxmargin|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
+   "match" : "(textextoffset|textextanchor|squared|sq|softlighttransparent|shadefactor|screentransparent|saturationtransparent|rounded|rgbcolormodel|pushparameters|presetparameters|popparameters|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|normaltransparent|nocolormodel|multiplytransparent|mitered|metapostversion|maxdimensions|luminositytransparent|lightentransparent|labeloffset|join_radius|infinity|huetransparent|hasparameter|hasoption|hardlighttransparent|greycolormodel|graycolormodel|getparametertext|getparameters|getparameterpath|getparameterdefault|getparametercount|getparameter|getmaxparametercount|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|definecolor|defaultscale|defaultpen|darkentransparent|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|butt|beveled|bboxmargin|applyparameters|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
    "name" : "context.data.shortcut.mps"
   },
   "special" : {
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 7a4693947..c42a21d13 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 420abff39..5e7b80ac8 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 a695ee7ff..a6e83085f 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 c7e6c6cbf..71cb7eaa8 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 cea823ad8..f8df2036f 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 0e13f126e..6ee9c83d2 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 65e3302ef..bf1adfd0d 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 c76f369ed..130408cf9 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 8a8c57623..7087bb0e2 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 e62bcd178..5f803464f 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 80726bae9..f8f5cfa5b 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 aec3cafd7..07dbe708d 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 069f87a33..075e71cd9 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 36d5f9d14..79a6d0a9f 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
diff --git a/metapost/context/base/mpiv/mp-lmtx.mpxl b/metapost/context/base/mpiv/mp-lmtx.mpxl
index deeba988f..fe511b74f 100644
--- a/metapost/context/base/mpiv/mp-lmtx.mpxl
+++ b/metapost/context/base/mpiv/mp-lmtx.mpxl
@@ -532,7 +532,8 @@ enddef ;
 %     )
 % enddef ;
 
-% more
+% Here we use nodraw and dodraw to create efficient axis ticks. Yet another demo
+% of coding.
 
 presetparameters "function" [
     sx          = 1mm,
@@ -541,16 +542,20 @@ presetparameters "function" [
     xmin        = 1,
     xmax        = 1,
     xstep       = 1,
-    xsmall      = 1,
-    xlarge      = 1,
+    xsmall      = 0,
+    xlarge      = 0,
     xlabels     = "no",
     xticks      = "bottom", % top bottom middle
     xcaption    = "",
     ymin        = 1,
     ymax        = 1,
     ystep       = 1,
-    ysmall      = 1,
-    ylarge      = 1,
+    ysmall      = 0,
+    ylarge      = 0,
+  % xfirst      = 0,
+  % xlast       = 0,
+  % yfirst      = 0,
+  % ylast       = 0,
     ylabels     = "no",
     yticks      = "left", % left right middle
     ycaption    = "",
@@ -567,6 +572,7 @@ presetparameters "function" [
     pointcolor  = "",
     xarrow      = "",
     yarrow      = "",
+    reverse     = false,
 ] ;
 
 def lmt_function = applyparameters "function" "lmt_do_function" enddef ;
@@ -605,10 +611,11 @@ vardef lmt_do_function =
         tt := identity xyscaled(ts/sx,ts/sy) ;
         pickup pencircle xyscaled(lw/sx,lw/sy) ;
         draw image (
-            save xmin, xmax, xstep, xsmall, xlarge, ymin, ymax, ystep, ysmall, ylarge ;
-            save code, option, txl, txs, tyl, tys ;
+            save xmin, xmax, xstep, xsmall, xlarge, ymin, ymax, ystep, ysmall, ylarge, p ;
+            save code, option, txl, txs, tyl, tys, swap ;
             string code, option ;
-            path txl, txs, tyl, tys ;
+            path txl, txs, tyl, tys ; boolean swap ;
+            picture p ;
 
             xmin    := getparameter "xmin" ;
             xmax    := getparameter "xmax" ;
@@ -621,6 +628,9 @@ vardef lmt_do_function =
             ysmall  := getparameter "ysmall" ;
             ylarge  := getparameter "ylarge" ;
             code    := getparameter "code" ;
+            swap    := getparameter "reverse" ;
+
+            if swap : p := image ( fi
 
             if (getparametercount "functions") > 0 :
                 for s = 1 upto getparametercount "functions" :
@@ -658,6 +668,8 @@ vardef lmt_do_function =
                 ) ;
             fi ;
 
+            if swap : ) ; fi
+
             option := getparameter "xticks" ;
             if option = "top" :
                 txs := (0,0) -- (0,tl) ;
@@ -683,6 +695,11 @@ vardef lmt_do_function =
 
             % this arrow head scaling is for Alan to sort out ...
 
+            xmin := getparameterdefault "xfirst" xmin ;
+            xmax := getparameterdefault "xlast"  xmax ;
+            ymin := getparameterdefault "yfirst" ymin ;
+            ymax := getparameterdefault "ylast"  ymax ;
+
             option := getparameter "xarrow" ;
             if option = "yes" :
                 save ahlength ; ahlength  := tl ;
@@ -696,9 +713,9 @@ vardef lmt_do_function =
             if option = "yes" :
                 save ahlength ; ahlength := tl ;
                 % save ahangle  ; ahangle  := 100/sx ;
-                drawarrow (0,ymin) -- (0,ymax) ;
+                drawarrow (xmin,ymin) -- (xmin,ymax) ;
             else :
-                draw (0,ymin) -- (0,ymax) ;
+                draw (xmin,ymin) -- (xmin,ymax) ;
             fi ;
 
             option := getparameter "frame" ;
@@ -706,81 +723,101 @@ vardef lmt_do_function =
                 draw (xmin,ymin) -- (xmax,ymin) -- (xmax,ymax) -- (xmin,ymax) -- cycle ;
             elseif (option = "ticks") or (option = "sticks") :
                 draw (xmin,ymin) -- (xmax,ymin) -- (xmax,ymax) -- (xmin,ymax) -- cycle ;
-                if xsmall > 1 :
+                if xsmall > 0 :
                     txs := ((0,0) -- (0,tl)) if option = "sticks" : rotated 180 fi ;
                     txs := txs transformed tr ;
                     for i = xmin step ((xmax-xmin)/xsmall) until xmax :
-                        draw txs shifted (i,ymin);
+                        nodraw txs shifted (i,ymin) ;
                     endfor ;
                     txs := (0,0) -- (0,-tl) if option = "sticks" : rotated 180 fi ;
                     txs := txs transformed tr ;
                     for i = xmin step ((xmax-xmin)/xsmall) until xmax :
-                        draw txs shifted (i,ymax);
+                        nodraw txs shifted (i,ymax) ;
                     endfor ;
+                    dodraw (xmin,ymin) ; % flush snippets
                 fi ;
-                if ysmall > 1 :
+                if ysmall > 0 :
                     tys := (0,0) -- (tl,0) if option = "sticks" : rotated 180 fi ;
                     tys := tys transformed tr ;
-                    for i = ymin step ((ymax-ymin)/ysmall) until ymax :
-                        draw tys shifted (xmin,i);
+                    for i = ymin step ysmall until ymax :
+                        nodraw tys shifted (xmin,i) ;
                     endfor ;
                     tys := (0,0) -- (-tl,0) if option = "sticks" : rotated 180 fi ;
                     tys := tys transformed tr ;
-                    for i = ymin step ((ymax-ymin)/ysmall) until ymax :
-                        draw tys shifted (xmax,i);
+                    for i = ymin step ysmall until ymax :
+                        nodraw tys shifted (xmax,i) ;
                     endfor ;
+                    dodraw (xmin,ymin) ; % flush snippets
                 fi ;
             fi ;
 
-            if xsmall > 1 :
-                for i = xmin step ((xmax-xmin)/xsmall) until xmax :
-                    draw txs shifted (i,0) ;
+            if xsmall > 0 :
+                for i = xmin step xsmall until xmax :
+                    nodraw txs shifted (i,0) ;
                 endfor ;
             fi ;
 
-            if xlarge > 1 :
-                option := getparameter "xlabels" ;
-                for i = xmin step ((xmax-xmin)/xlarge) until xmax :
-                    draw txl shifted (i,0) ;
-                    if (option <> "no") and (i <> 0) :
-                        if (option <> "nolimits") or ((i > xmin) and (i < xmax)) :
-                            draw textext.bot(decimal i) transformed tt
-                                shifted (i,1.25*(ypart point 0 of txl)) ;
-                        fi ;
-                    fi ;
+            if xlarge > 0 :
+                for i = xmin step xlarge until xmax :
+                    nodraw txl shifted (i,0) ;
+                endfor ;
+                dodraw (xmin,0) ; % flush snippets
+            elseif xsmall > 0 :
+                dodraw (xmin,0) ; % flush snippets
+            fi ;
+
+            if ysmall > 0 :
+                for i = ymin step ysmall until ymax :
+                    nodraw tys shifted (xmin,i) ;
                 endfor ;
             fi ;
 
-            if ysmall > 1 :
-                for i = ymin step ((ymax-ymin)/ysmall) until ymax :
-                    draw tys shifted (0,i) ;
+            if ylarge > 0 :
+                for i = ymin step ylarge until ymax :
+                    nodraw tyl shifted (xmin,i) ;
                 endfor ;
+                dodraw (xmin,ymin) ; % flush snippets
+            elseif ysmall > 0 :
+                dodraw (xmin,ymin) ; % flush snippets
+            fi ;
+
+            if swap : draw p fi ;
+
+            if xlarge > 0 :
+                option := getparameter "xlabels" ;
+                if option <> "no" :
+                    for i = xmin step xlarge until xmax :
+                        if ((i <> 0) and ((option <> "nolimits") or ((i > xmin) and (i < xmax)))) :
+                            draw textext.bot(decimal i) transformed tt
+                                shifted (i,1.25*(ypart point 0 of txl)) ;
+                        fi ;
+                    endfor ;
+                fi ;
             fi ;
 
-            if ylarge > 1 :
+            if ylarge > 0 :
                 option := getparameter "ylabels" ;
-                for i = ymin step ((ymax-ymin)/ylarge) until ymax :
-                    draw tyl shifted (0,i) ;
-                    if (option <> "no") and (i <> 0) :
-                        if (option <> "nolimits") or ((i > ymin) and (i < ymax)) :
+                if option <> "no" :
+                    for i = ymin step ylarge until ymax :
+                        if ((i <> 0) and ((option <> "nolimits") or ((i > ymin) and (i < ymax)))) :
                             draw textext.lft(decimal i) transformed tt
-                                shifted (1.25*(xpart point 0 of tyl),i) ;
+                                shifted (xmin+1.25*(xpart point 0 of tyl),i) ;
                         fi ;
-                    fi ;
-                endfor ;
+                    endfor ;
+                fi ;
             fi ;
 
             option := getparameter "xcaption" ;
             if (option <> "") :
                 draw textext.bot(option) transformed tt
-                    shifted (0,-tl)
+                    shifted (xmin,-tl)
                     shifted center bottomboundary currentpicture ;
             fi ;
 
             option := getparameter "ycaption" ;
             if (option <> "") :
                 draw textext.lft(option) transformed tt
-                    shifted (-tl,0)
+                    shifted (xmin-tl,0)
                     shifted center leftboundary currentpicture ;
             fi ;
         )
diff --git a/metapost/context/base/mpiv/mp-luas.mpxl b/metapost/context/base/mpiv/mp-luas.mpxl
index a4c921b72..cd6733f84 100644
--- a/metapost/context/base/mpiv/mp-luas.mpxl
+++ b/metapost/context/base/mpiv/mp-luas.mpxl
@@ -210,7 +210,7 @@ newinternal mfid_getparametercount    ; mfid_getparametercount    := scriptindex
 newinternal mfid_getmaxparametercount ; mfid_getmaxparametercount := scriptindex "getmaxparametercount" ;
 newinternal mfid_getparameterpath     ; mfid_getparameterpath     := scriptindex "getparameterpath" ;
 newinternal mfid_getparametertext     ; mfid_getparametertext     := scriptindex "getparametertext" ;
-newinternal mfid_getparameteroption   ; mfid_getparameteroption   := scriptindex "getparameteroption" ;
+%%%%%%%%%%% mfid_getparameteroption   ; mfid_getparameteroption   := scriptindex "getparameteroption" ;
 newinternal mfid_applyparameters      ; mfid_applyparameters      := scriptindex "applyparameters" ;
 newinternal mfid_pushparameters       ; mfid_pushparameters       := scriptindex "pushparameters" ;
 newinternal mfid_popparameters        ; mfid_popparameters        := scriptindex "popparameters" ;
@@ -225,7 +225,7 @@ def getparametercount    = runscript mfid_getparametercount    enddef ;
 def getmaxparametercount = runscript mfid_getmaxparametercount enddef ;
 def getparameterpath     = runscript mfid_getparameterpath     enddef ;
 def getparametertext     = runscript mfid_getparametertext     enddef ;
-def getparameteroption   = runscript mfid_getparameteroption   enddef ;
+%%% getparameteroption   = runscript mfid_getparameteroption   enddef ;
 def applyparameters      = runscript mfid_applyparameters      enddef ;
 def pushparameters       = runscript mfid_pushparameters       enddef ;
 def popparameters        = runscript mfid_popparameters        enddef ;
diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv
index a651d2270..7d20da104 100644
--- a/metapost/context/base/mpiv/mp-mlib.mpiv
+++ b/metapost/context/base/mpiv/mp-mlib.mpiv
@@ -1680,6 +1680,8 @@ def eofillup text t = draw t withpostscript "eoboth"  enddef ; % we use draw bec
 def eofill   text t = fill t withpostscript "evenodd" enddef ;
 def nofill   text t = fill t withpostscript "collect" enddef ;
 def nodraw   text t = draw t withpostscript "collect" enddef ;
+def dodraw   text t = draw t withpostscript "flush"   enddef ;
+def dofill   text t = fill t withpostscript "flush"   enddef ;
 %%% eoclip   text t = clip t withpostscript "evenodd" enddef ; % no postscripts yet
 
 % def withrule expr r =
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index bca3721ce..eced6e05b 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{2019.09.09 13:44}
+\newcontextversion{2019.09.10 20:03}
 
 %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 f56da6309..b3afbbceb 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{2019.09.09 13:44}
+\edef\contextversion{2019.09.10 20:03}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 6b2995517..a957e8f17 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -637,6 +637,7 @@
 \setinterfaceconstant{aligntitle}{titelausrichten}
 \setinterfaceconstant{alternative}{alternative}
 \setinterfaceconstant{anchor}{anchor}
+\setinterfaceconstant{anchoring}{anchoring}
 \setinterfaceconstant{andtext}{andtext}
 \setinterfaceconstant{apa}{apa}
 \setinterfaceconstant{arguments}{arguments}
@@ -866,6 +867,7 @@
 \setinterfaceconstant{hfil}{hfil}
 \setinterfaceconstant{hidenumber}{hidenumber}
 \setinterfaceconstant{hoffset}{hoffset}
+\setinterfaceconstant{horizontal}{horizontal}
 \setinterfaceconstant{horoffset}{rumpfabstand}
 \setinterfaceconstant{hyphen}{hyphen}
 \setinterfaceconstant{hyphens}{hyphens}
@@ -966,9 +968,12 @@
 \setinterfaceconstant{menu}{menue}
 \setinterfaceconstant{method}{methode}
 \setinterfaceconstant{middle}{mittig}
+\setinterfaceconstant{middlecolor}{middlecolor}
 \setinterfaceconstant{middlecommand}{middlecommand}
 \setinterfaceconstant{middlespeech}{middlespeech}
+\setinterfaceconstant{middlestyle}{middlestyle}
 \setinterfaceconstant{middletext}{mittigertext}
+\setinterfaceconstant{middlewidth}{middlewidth}
 \setinterfaceconstant{midsentence}{midsentence}
 \setinterfaceconstant{min}{min}
 \setinterfaceconstant{mindepth}{mindepth}
@@ -1286,6 +1291,7 @@
 \setinterfaceconstant{vcompact}{vcompact}
 \setinterfaceconstant{vector}{vector}
 \setinterfaceconstant{veroffset}{kopfoffset}
+\setinterfaceconstant{vertical}{vertikal}
 \setinterfaceconstant{vfactor}{vfaktor}
 \setinterfaceconstant{vfil}{vfil}
 \setinterfaceconstant{viewerprefix}{viewerprefix}
@@ -1296,6 +1302,7 @@
 \setinterfaceconstant{white}{weiss}
 \setinterfaceconstant{width}{breite}
 \setinterfaceconstant{words}{words}
+\setinterfaceconstant{xanchor}{xanchor}
 \setinterfaceconstant{xfactor}{xfaktor}
 \setinterfaceconstant{xhtml}{xhtml}
 \setinterfaceconstant{xmax}{xmax}
@@ -1303,6 +1310,7 @@
 \setinterfaceconstant{xoffset}{xoffset}
 \setinterfaceconstant{xscale}{xformat}
 \setinterfaceconstant{xstep}{xschritt}
+\setinterfaceconstant{yanchor}{yanchor}
 \setinterfaceconstant{yfactor}{yfaktor}
 \setinterfaceconstant{ymax}{ymax}
 \setinterfaceconstant{yoffset}{yoffset}
diff --git a/tex/context/base/mkiv/back-pdf.mkiv b/tex/context/base/mkiv/back-pdf.mkiv
index 2541755a6..ff05e647f 100644
--- a/tex/context/base/mkiv/back-pdf.mkiv
+++ b/tex/context/base/mkiv/back-pdf.mkiv
@@ -143,4 +143,10 @@
 
 \let\pdfactualtext\pdfbackendactualtext
 
+%D Bah, this is also needed for tikz:
+
+\let\pdfsavepos \savepos
+\let\pdflastxpos\lastxpos
+\let\pdflastypos\lastypos
+
 \protect \endinput
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 37364a19a..0a68310a0 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2019.09.09 13:44}
+\newcontextversion{2019.09.10 20:03}
 
 %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 b417e09a7..2c17d4b91 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.09.09 13:44}
+\edef\contextversion{2019.09.10 20:03}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index aaf35d985..39f647cc2 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2019.09.09 13:44}
+\edef\contextversion{2019.09.10 20:03}
 \edef\contextkind   {beta}
 
 %D Kind of special:
diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua
index 6d71071a0..4f6090ef5 100644
--- a/tex/context/base/mkiv/core-con.lua
+++ b/tex/context/base/mkiv/core-con.lua
@@ -311,12 +311,15 @@ local function textime()
     return tonumber(osdate("%H")) * 60 + tonumber(osdate("%M"))
 end
 
-function converters.year  () return osdate("%Y") end
-function converters.month () return osdate("%m") end -- always two digits
-function converters.day   () return osdate("%d") end
-function converters.hour  () return osdate("%H") end
-function converters.minute() return osdate("%M") end
-function converters.second() return osdate("%S") end
+-- For consistenty we need to add day here but that conflicts with the current
+-- serializer so then best is to have none from now on:
+
+-- function converters.year  () return osdate("%Y") end
+-- function converters.month () return osdate("%m") end -- always two digits
+-- function converters.day   () return osdate("%d") end -- conflicts
+-- function converters.hour  () return osdate("%H") end
+-- function converters.minute() return osdate("%M") end
+-- function converters.second() return osdate("%S") end
 
 converters.weekday    = weekday
 converters.isleapyear = isleapyear
@@ -330,6 +333,7 @@ implement { name = "nofdays",  actions = { nofdays,  context }, arguments = { "i
 
 implement { name = "year",     actions = { osdate,   context }, arguments = "'%Y'" }
 implement { name = "month",    actions = { osdate,   context }, arguments = "'%m'" }
+implement { name = "day",      actions = { osdate,   context }, arguments = "'%d'" }
 implement { name = "hour",     actions = { osdate,   context }, arguments = "'%H'" }
 implement { name = "minute",   actions = { osdate,   context }, arguments = "'%M'" }
 implement { name = "second",   actions = { osdate,   context }, arguments = "'%S'" }
diff --git a/tex/context/base/mkiv/font-aux.lua b/tex/context/base/mkiv/font-aux.lua
index 4ac6278cb..0e4d7add3 100644
--- a/tex/context/base/mkiv/font-aux.lua
+++ b/tex/context/base/mkiv/font-aux.lua
@@ -240,3 +240,7 @@ function fonts.getmultiple(tfmdata,k,kind)
         return 0
     end
 end
+
+function fonts.getindices(tfmdata)
+    return getindices(tfmdata)
+end
diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua
index 29aa3eac7..10d2df270 100644
--- a/tex/context/base/mkiv/font-ocl.lua
+++ b/tex/context/base/mkiv/font-ocl.lua
@@ -10,12 +10,15 @@ if not modules then modules = { } end modules ['font-ocl'] = {
 
 local tostring, tonumber, next = tostring, tonumber, next
 local round, max = math.round, math.round
-local sortedkeys, sortedhash = table.sortedkeys, table.sortedhash
+local gsub, find = string.gsub, string.find
+local sortedkeys, sortedhash, concat = table.sortedkeys, table.sortedhash, table.concat
 local setmetatableindex = table.setmetatableindex
 
 local formatters   = string.formatters
 local tounicode    = fonts.mappings.tounicode
 
+local bpfactor     = number.dimenfactors.bp
+
 local helpers      = fonts.helpers
 
 local charcommand  = helpers.commands.char
@@ -371,8 +374,8 @@ local function pdftovirtual(tfmdata,pdfshapes,kind) -- kind = png|svg
             local dy   = nil
             if typ == "table" then
                 data = pdf.data
-                dx   = pdf.dx or 0
-                dy   = pdf.dy or 0
+                dx   = pdf.x or pdf.dx or 0
+                dy   = pdf.y or pdf.dy or 0
             elseif typ == "string" then
                 data = pdf
                 dx   = 0
@@ -386,11 +389,19 @@ local function pdftovirtual(tfmdata,pdfshapes,kind) -- kind = png|svg
                 local wd = character.width  or 0
                 local ht = character.height or 0
                 local dp = character.depth  or 0
-                -- The down and right will change too (we can move that elsewhere).
+                -- The down and right will change too (we can move that elsewhere). We have
+                -- a different treatment in lmtx but the next kind of works. These images are
+                -- a mess anyway as in svg the bbox can be messed up absent). A png image
+                -- needs the x/y. I might normalize this once we moev to lmtx exlusively.
                 character.commands = {
                     not unicode and actualb or { "pdf", "page", (getactualtext(unicode)) },
-                    downcommand[dp + dy * hfactor],
-                    rightcommand[dx * hfactor],
+                    -- lmtx (when we deal with depth in vfimage, currently disabled):
+                 -- downcommand [dy * hfactor],
+                 -- rightcommand[dx * hfactor],
+                 -- vfimage(wd,ht,dp,data,name),
+                    -- mkiv
+                    downcommand [dp + dy * hfactor],
+                    rightcommand[     dx * hfactor],
                     vfimage(wd,ht,dp,data,name),
                     actuale,
                 }
@@ -437,7 +448,7 @@ do
         name     = "otfsvg",
         program  = "inkscape",
         method   = "pipeto",
-        template = "--shell > temp-otf-svg-shape.log",
+        template = "--export-area-drawing --shell > temp-otf-svg-shape.log",
         reporter = report_svg,
     }
 
@@ -446,20 +457,25 @@ do
         -- poor mans variant for generic:
         --
         runner = function()
-            return io.open("inkscape --shell > temp-otf-svg-shape.log","w")
+            return io.open("inkscape --export-area-drawing --shell > temp-otf-svg-shape.log","w")
         end
     end
 
-    function otfsvg.topdf(svgshapes)
+    -- There are svg out there with bad viewBox specifications where shapes lay outside that area,
+    -- but trying to correct that didin'w work out well enough so I discarded that code.
+
+    function otfsvg.topdf(svgshapes,tfmdata)
         local pdfshapes = { }
         local inkscape  = runner()
         if inkscape then
-            local nofshapes   = #svgshapes
-            local f_svgfile   = formatters["temp-otf-svg-shape-%i.svg"]
-            local f_pdffile   = formatters["temp-otf-svg-shape-%i.pdf"]
-            local f_convert   = formatters["%s --export-pdf=%s\n"]
-            local filterglyph = otfsvg.filterglyph
-            local nofdone     = 0
+            local indices      = fonts.getindices(tfmdata)
+            local descriptions = tfmdata.descriptions
+            local nofshapes    = #svgshapes
+            local f_svgfile    = formatters["temp-otf-svg-shape-%i.svg"]
+            local f_pdffile    = formatters["temp-otf-svg-shape-%i.pdf"]
+            local f_convert    = formatters["%s --export-pdf=%s\n"]
+            local filterglyph  = otfsvg.filterglyph
+            local nofdone      = 0
             report_svg("processing %i svg containers",nofshapes)
             statistics.starttiming()
             for i=1,nofshapes do
@@ -485,7 +501,13 @@ do
             for index in next, pdfshapes do
                 local svgfile = f_svgfile(index)
                 local pdffile = f_pdffile(index)
-                pdfshapes[index] = loaddata(pdffile)
+             -- local fntdata = descriptions[indices[index]]
+             -- local bounds  = fntdata and fntdata.boundingbox
+                pdfshapes[index] = {
+                    data = loaddata(pdffile),
+                 -- x    = bounds and bounds[1] or 0,
+                 -- y    = bounds and bounds[2] or 0,
+                }
                 remove(svgfile)
                 remove(pdffile)
             end
@@ -512,7 +534,7 @@ local function initializesvg(tfmdata,kind,value) -- hm, always value
         if not pdfshapes or pdffile.timestamp ~= timestamp then
             local svgfile   = containers.read(otf.svgcache,hash)
             local svgshapes = svgfile and svgfile.svgshapes
-            pdfshapes = svgshapes and otfsvg.topdf(svgshapes) or { }
+            pdfshapes = svgshapes and otfsvg.topdf(svgshapes,tfmdata) or { }
             containers.write(otf.pdfcache, hash, {
                 pdfshapes = pdfshapes,
                 timestamp = timestamp,
diff --git a/tex/context/base/mkiv/lpdf-lmt.lua b/tex/context/base/mkiv/lpdf-lmt.lua
index 6913e24e9..709a9d48a 100644
--- a/tex/context/base/mkiv/lpdf-lmt.lua
+++ b/tex/context/base/mkiv/lpdf-lmt.lua
@@ -1137,14 +1137,16 @@ local flushrule, flushsimplerule, flushimage  do
               xsize, ysize,
               rotation,
               objnum,
-              groupref  = pdfincludeimage(index)
+              groupref = pdfincludeimage(index)
 
         local rx = width / xsize
         local sx = 0
         local sy = 0
         local ry = total / ysize
         local tx = pos_h
-        local ty = pos_v - 2 * depth -- to be sorted out
+        -- to be sorted out
+     -- local ty = pos_v - depth
+        local ty = pos_v -- we assume that depth is dealt with in the caller (for now)
 
         usedximages[index] = objnum
 
diff --git a/tex/context/base/mkiv/mlib-pdf.lua b/tex/context/base/mkiv/mlib-pdf.lua
index 65f3b2016..524e930a9 100644
--- a/tex/context/base/mkiv/mlib-pdf.lua
+++ b/tex/context/base/mkiv/mlib-pdf.lua
@@ -460,12 +460,15 @@ local linewidth = false
                                         local evenodd    = false
                                         local collect    = false
                                         local both       = false
+                                        local flush      = false
                                         local postscript = object.postscript
                                         if not object.istext then
                                             if postscript == "evenodd" then
                                                 evenodd = true
                                             elseif postscript == "collect" then
                                                 collect = true
+                                            elseif postscript == "flush" then
+                                                flush   = true
                                             elseif postscript == "both" then
                                                 both = true
                                             elseif postscript == "eoboth" then
@@ -474,7 +477,9 @@ local linewidth = false
                                             end
                                         end
                                         --
-                                        if collect then
+                                        if flush and not savedpath then
+                                            -- forget about it
+                                        elseif collect then
                                             if not savedpath then
                                                 savedpath = { object.path or false }
                                                 savedhtap = { object.htap or false }
@@ -554,7 +559,9 @@ end
                                                     end
                                                     savedpath = nil
                                                 end
-                                                if transformed then
+                                                if flush then
+                                                    -- ignore this path
+                                                elseif transformed then
                                                     flushconcatpath(path,result,open)
                                                 else
                                                     flushnormalpath(path,result,open)
diff --git a/tex/context/base/mkiv/mlib-scn.lua b/tex/context/base/mkiv/mlib-scn.lua
index ec0f7397b..a85c861bd 100644
--- a/tex/context/base/mkiv/mlib-scn.lua
+++ b/tex/context/base/mkiv/mlib-scn.lua
@@ -625,30 +625,30 @@ local function getparametertext()
     end
 end
 
-local function getparameteroption()
-    local list, n = collectnames()
-    local last = list[n]
-    if type(last) == "string" then
-        n = n - 1
-    else
-        return false
-    end
-    local v = namespaces
-    for i=1,n do
-        v = v[list[i]]
-        if not v then
-            break
-        end
-    end
-    if type(v) == "string" and v ~= "" then
-        for s in gmatch(v,"[^ ,]+") do
-            if s == last then
-                return true
-            end
-        end
-    end
-    return false
-end
+-- local function getparameteroption()
+--     local list, n = collectnames()
+--     local last = list[n]
+--     if type(last) == "string" then
+--         n = n - 1
+--     else
+--         return false
+--     end
+--     local v = namespaces
+--     for i=1,n do
+--         v = v[list[i]]
+--         if not v then
+--             break
+--         end
+--     end
+--     if type(v) == "string" and v ~= "" then
+--         for s in gmatch(v,"[^ ,]+") do
+--             if s == last then
+--                 return true
+--             end
+--         end
+--     end
+--     return false
+-- end
 
 metapost.registerscript("getparameters",       getparameters)
 metapost.registerscript("applyparameters",     applyparameters)
@@ -661,7 +661,7 @@ metapost.registerscript("getparametercount",   getparametercount)
 metapost.registerscript("getmaxparametercount",getmaxparametercount)
 metapost.registerscript("getparameterpath",    getparameterpath)
 metapost.registerscript("getparametertext",    getparametertext)
-metapost.registerscript("getparameteroption",  getparameteroption)
+--------.registerscript("getparameteroption",  getparameteroption)
 metapost.registerscript("pushparameters",      pushparameters)
 metapost.registerscript("popparameters",       popparameters)
 
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index b652e4d44..d18d1bc0e 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -18,6 +18,24 @@ return {
         "dq", "sq",
         "crossingscale", "crossingoption",
         "contextlmtxmode",
+        --
+        -- for the moment we put these here as they need to stand out
+        --
+        "getparameters",
+        "presetparameters",
+        "hasparameter",
+        "hasoption",
+        "getparameter",
+        "getparameterdefault",
+        "getparametercount",
+        "getmaxparametercount",
+        "getparameterpath",
+        "getparametertext",
+     -- "getparameteroption",
+        "applyparameters",
+        "pushparameters",
+        "popparameters",
+        "definecolor",
     },
     commands = {
         "loadfile", "loadimage", "loadmodule",
@@ -137,7 +155,7 @@ return {
         "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote",
         "startpassingvariable", "stoppassingvariable",
         --
-        "eofill", "eoclip", "nofill", "fillup", "eofillup", "nodraw",
+        "eofill", "eoclip", "nofill", "dofill", "fillup", "eofillup", "nodraw", "dodraw",
         "area",
         --
         "addbackground",
diff --git a/tex/context/base/mkiv/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua
index 701b7b6da..35035308e 100644
--- a/tex/context/base/mkiv/mult-mps.lua
+++ b/tex/context/base/mkiv/mult-mps.lua
@@ -118,6 +118,7 @@ return {
         "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in",
         --
         "triplet", "quadruplet", "totransform",
+        --
     },
     internals = { -- we need to remove duplicates above
         --
diff --git a/tex/context/base/mkiv/page-col.mkiv b/tex/context/base/mkiv/page-col.mkiv
index 14b512421..272ffe181 100644
--- a/tex/context/base/mkiv/page-col.mkiv
+++ b/tex/context/base/mkiv/page-col.mkiv
@@ -30,6 +30,9 @@
 \setnewconstant\maxnofcolumns       50
 \setnewconstant\allocatednofcolumns  0
 
+\newdimen\columnwidth
+\newdimen\columndistance
+
 %D During initialization the temporary boxes are allocated. This enables us to
 %D use as much columns as we want, without exhausting the pool of boxes too
 %D fast. We could have packed them in one box, but we've got enough boxes.
diff --git a/tex/context/base/mkiv/page-cst.mkiv b/tex/context/base/mkiv/page-cst.mkiv
index 8444e4e16..1c89f3443 100644
--- a/tex/context/base/mkiv/page-cst.mkiv
+++ b/tex/context/base/mkiv/page-cst.mkiv
@@ -181,6 +181,12 @@
    \setupoutputroutine[\s!pagegrid]%
    \page_grd_command_set_hsize
    \page_grd_command_set_vsize
+   %
+   \columnwidth   \d_page_grd_column_width
+   \columndistance\d_page_grd_distance
+   \nofcolumns    \c_page_grd_n_of_left    % not always ok
+   \textwidth     \d_page_grd_column_width % kind of redundant but we had it so ...
+   %
    }%\begingroup}
 
 \unexpanded\def\stoppagegrid
diff --git a/tex/context/base/mkiv/page-mix.mkiv b/tex/context/base/mkiv/page-mix.mkiv
index 993edb89a..f41d739be 100644
--- a/tex/context/base/mkiv/page-mix.mkiv
+++ b/tex/context/base/mkiv/page-mix.mkiv
@@ -261,7 +261,7 @@
 
 \unexpanded\def\page_mix_command_set_hsize
   {\hsize\d_page_mix_column_width
-   \textwidth\d_page_mix_column_width}
+   \columnwidth\d_page_mix_column_width}
 
 %D When setting the vsize we make sure that we collect a few more lines than needed
 %D so that we have enough to split over the columns. Collecting too much is somewhat
@@ -566,6 +566,11 @@
    %
    \d_page_mix_column_width\dimexpr(\d_page_mix_max_width-\d_page_mix_distance*\numexpr(\c_page_mix_n_of_columns-\plusone)\relax)/\c_page_mix_n_of_columns\relax
    %
+   \columnwidth   \d_page_mix_column_width
+   \columndistance\d_page_mix_distance
+   \nofcolumns    \c_page_mix_n_of_columns
+   \textwidth     \d_page_mix_column_width % kind of redundant but we had it so ...
+   %
    \usemixedcolumnscolorparameter\c!color
    %
    \insidecolumnstrue % new
diff --git a/tex/context/base/mkiv/page-one.mkiv b/tex/context/base/mkiv/page-one.mkiv
index dc157fbeb..31b4e22d9 100644
--- a/tex/context/base/mkiv/page-one.mkiv
+++ b/tex/context/base/mkiv/page-one.mkiv
@@ -29,7 +29,8 @@
   {\page_otr_eject_page_and_flush_inserts}
 
 \unexpanded\def\page_one_command_set_hsize
-  {\global\hsize\textwidth}
+  {\global\hsize\textwidth
+   \columnwidth\textwidth} % bonus so that it's not zero
 
 \unexpanded\def\page_one_command_set_float_hsize
   {\global\hsize\textwidth}
diff --git a/tex/context/base/mkiv/page-pcl.mkiv b/tex/context/base/mkiv/page-pcl.mkiv
index 3cb5bf1c8..61c542e1c 100644
--- a/tex/context/base/mkiv/page-pcl.mkiv
+++ b/tex/context/base/mkiv/page-pcl.mkiv
@@ -94,7 +94,9 @@
    \else
      \numexpr\c_page_col_n_of_columns-\plusone\relax
      \dimexpr\d_page_col_column_width+\d_page_col_distance\relax
-   \fi}
+   \fi
+   % consistent with mixed:
+   \textwidth\d_page_col_column_width}
 
 %D \unknown
 
@@ -729,9 +731,6 @@
     \setuevalue{\e!stop \currentpagecolumns}{\stoppagecolumns}%
 \to \everydefinepagecolumns
 
-\ifdefined \columnwidth    \else \newdimen\columnwidth    \fi
-\ifdefined \columndistance \else \newdimen\columndistance \fi
-
 \def\page_col_pickup_preceding
   {\begingroup
    \setupoutputroutine[\s!mixedcolumn]%
@@ -800,6 +799,8 @@
    %
    \columnwidth    \d_page_col_column_width
    \columndistance \d_page_col_distance
+   \nofcolumns     \c_page_col_n_of_columns
+   \textwidth      \columnwidth % kind of redundant
    %
    \nopenalties
    %
@@ -835,8 +836,6 @@
    \page_col_command_set_vsize
    \page_col_command_set_hsize
    %
-   \nofcolumns\c_page_mix_n_of_columns
-   %
    \unexpanded\def\page_col_start[##1]%
      {\page_col_start_nop}%
    %
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 274a5a155..75ea1077e 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 f2e008447..726657bc3 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-ref.lua b/tex/context/base/mkiv/strc-ref.lua
index e01bacaac..ec5ed5e03 100644
--- a/tex/context/base/mkiv/strc-ref.lua
+++ b/tex/context/base/mkiv/strc-ref.lua
@@ -2603,16 +2603,40 @@ implement {
     arguments = { "string", "boolean", "boolean" }
 }
 
-local function referencerealpage()
+-- local function referencerealpage()
+--     local actions = references.currentset
+--     return not actions and 0 or actions.realpage or setreferencerealpage(actions)
+-- end
+--
+-- implement {
+--     name      = "referencerealpage",
+--     actions   = { referencerealpage, context },
+--  -- arguments = "string" -- hm, weird
+-- }
+--
+-- implement {
+--     name      = "referencerealpage",
+--     actions   = function()
+--         local actions = references.currentset
+--         context(not actions and 0 or actions.realpage or setreferencerealpage(actions))
+--     end
+-- }
+
+local function referencepos(key)
     local actions = references.currentset
-    return not actions and 0 or actions.realpage or setreferencerealpage(actions)
+    local i = actions[1].i -- brrr
+    local v = 0
+    if i then
+        local a = i.references
+        if a then
+            v = a[key] or 0
+        end
+    end
+    context("%p",v)
 end
 
-implement {
-    name      = "referencerealpage",
-    actions   = { referencerealpage, context },
-    arguments = "string"
-}
+implement { name = "referenceposx", actions = function() referencepos("x") end }
+implement { name = "referenceposy", actions = function() referencepos("y") end }
 
 local plist, nofrealpages
 
diff --git a/tex/context/base/mkiv/strc-ref.mkvi b/tex/context/base/mkiv/strc-ref.mkvi
index 05abd4930..cfe8744e2 100644
--- a/tex/context/base/mkiv/strc-ref.mkvi
+++ b/tex/context/base/mkiv/strc-ref.mkvi
@@ -1062,6 +1062,21 @@
 \def\referencerealpage
   {\clf_referencerealpage}
 
+% \unexpanded\def\columnreference#1%
+%   {\dontleavehmode
+%    \hpack to \zeropoint{\hpos{\v!column:#1}{\kern\dimexpr\textwidth/\nofcolumns\relax}\hss}}
+%
+% \def\columnnumber#1%
+%   {\numexpr\dimexpr\MPx{\v!column:#1}\relax/\dimexpr\MPw{\v!column:#1}\relax\relax}
+%
+% but nicer is:
+
+\def\referencecolumnnumber
+  {\numexpr
+     \dimexpr\clf_referenceposx-\cutspace\relax/\dimexpr\makeupwidth/\nofcolumns\relax
+    +\plusone
+   \relax}
+
 \unexpanded\def\tracedpagestate
   {{\blue\tttf(\ifcase\referencepagedetail unknown\or same\or previous\or next\or above\or below\else unknown\fi)}}
 
diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index 9ac3dcb03..b9cd9cc05 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -643,6 +643,7 @@
 		<cd:constant name='aligntitle' value='titelausrichten'/>
 		<cd:constant name='alternative' value='alternative'/>
 		<cd:constant name='anchor' value='anchor'/>
+		<cd:constant name='anchoring' value='anchoring'/>
 		<cd:constant name='andtext' value='andtext'/>
 		<cd:constant name='apa' value='apa'/>
 		<cd:constant name='arguments' value='arguments'/>
@@ -872,6 +873,7 @@
 		<cd:constant name='hfil' value='hfil'/>
 		<cd:constant name='hidenumber' value='hidenumber'/>
 		<cd:constant name='hoffset' value='hoffset'/>
+		<cd:constant name='horizontal' value='horizontal'/>
 		<cd:constant name='horoffset' value='rumpfabstand'/>
 		<cd:constant name='hyphen' value='hyphen'/>
 		<cd:constant name='hyphens' value='hyphens'/>
@@ -972,9 +974,12 @@
 		<cd:constant name='menu' value='menue'/>
 		<cd:constant name='method' value='methode'/>
 		<cd:constant name='middle' value='mittig'/>
+		<cd:constant name='middlecolor' value='middlecolor'/>
 		<cd:constant name='middlecommand' value='middlecommand'/>
 		<cd:constant name='middlespeech' value='middlespeech'/>
+		<cd:constant name='middlestyle' value='middlestyle'/>
 		<cd:constant name='middletext' value='mittigertext'/>
+		<cd:constant name='middlewidth' value='middlewidth'/>
 		<cd:constant name='midsentence' value='midsentence'/>
 		<cd:constant name='min' value='min'/>
 		<cd:constant name='mindepth' value='mindepth'/>
@@ -1292,6 +1297,7 @@
 		<cd:constant name='vcompact' value='vcompact'/>
 		<cd:constant name='vector' value='vector'/>
 		<cd:constant name='veroffset' value='kopfoffset'/>
+		<cd:constant name='vertical' value='vertikal'/>
 		<cd:constant name='vfactor' value='vfaktor'/>
 		<cd:constant name='vfil' value='vfil'/>
 		<cd:constant name='viewerprefix' value='viewerprefix'/>
@@ -1302,6 +1308,7 @@
 		<cd:constant name='white' value='weiss'/>
 		<cd:constant name='width' value='breite'/>
 		<cd:constant name='words' value='words'/>
+		<cd:constant name='xanchor' value='xanchor'/>
 		<cd:constant name='xfactor' value='xfaktor'/>
 		<cd:constant name='xhtml' value='xhtml'/>
 		<cd:constant name='xmax' value='xmax'/>
@@ -1309,6 +1316,7 @@
 		<cd:constant name='xoffset' value='xoffset'/>
 		<cd:constant name='xscale' value='xformat'/>
 		<cd:constant name='xstep' value='xschritt'/>
+		<cd:constant name='yanchor' value='yanchor'/>
 		<cd:constant name='yfactor' value='yfaktor'/>
 		<cd:constant name='ymax' value='ymax'/>
 		<cd:constant name='yoffset' value='yoffset'/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index a695ee7ff..a6e83085f 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 9e7b9123e..4d002f1b0 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-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e3a709a92..47bfe470f 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  : 09/09/19 13:44:26
+-- merge date  : 09/10/19 20:03:16
 
 do -- begin closure to overcome local limits and interference
 
@@ -32100,10 +32100,12 @@ if not modules then modules={} end modules ['font-ocl']={
 }
 local tostring,tonumber,next=tostring,tonumber,next
 local round,max=math.round,math.round
-local sortedkeys,sortedhash=table.sortedkeys,table.sortedhash
+local gsub,find=string.gsub,string.find
+local sortedkeys,sortedhash,concat=table.sortedkeys,table.sortedhash,table.concat
 local setmetatableindex=table.setmetatableindex
 local formatters=string.formatters
 local tounicode=fonts.mappings.tounicode
+local bpfactor=number.dimenfactors.bp
 local helpers=fonts.helpers
 local charcommand=helpers.commands.char
 local rightcommand=helpers.commands.right
@@ -32292,8 +32294,8 @@ local function pdftovirtual(tfmdata,pdfshapes,kind)
    local dy=nil
    if typ=="table" then
     data=pdf.data
-    dx=pdf.dx or 0
-    dy=pdf.dy or 0
+    dx=pdf.x or pdf.dx or 0
+    dy=pdf.y or pdf.dy or 0
    elseif typ=="string" then
     data=pdf
     dx=0
@@ -32306,8 +32308,8 @@ local function pdftovirtual(tfmdata,pdfshapes,kind)
     local dp=character.depth  or 0
     character.commands={
      not unicode and actualb or { "pdf","page",(getactualtext(unicode)) },
-     downcommand[dp+dy*hfactor],
-     rightcommand[dx*hfactor],
+     downcommand [dp+dy*hfactor],
+     rightcommand[  dx*hfactor],
      vfimage(wd,ht,dp,data,name),
      actuale,
     }
@@ -32342,18 +32344,20 @@ do
   name="otfsvg",
   program="inkscape",
   method="pipeto",
-  template="--shell > temp-otf-svg-shape.log",
+  template="--export-area-drawing --shell > temp-otf-svg-shape.log",
   reporter=report_svg,
  }
  if not runner then
   runner=function()
-   return io.open("inkscape --shell > temp-otf-svg-shape.log","w")
+   return io.open("inkscape --export-area-drawing --shell > temp-otf-svg-shape.log","w")
   end
  end
- function otfsvg.topdf(svgshapes)
+ function otfsvg.topdf(svgshapes,tfmdata)
   local pdfshapes={}
   local inkscape=runner()
   if inkscape then
+   local indices=fonts.getindices(tfmdata)
+   local descriptions=tfmdata.descriptions
    local nofshapes=#svgshapes
    local f_svgfile=formatters["temp-otf-svg-shape-%i.svg"]
    local f_pdffile=formatters["temp-otf-svg-shape-%i.pdf"]
@@ -32385,7 +32389,9 @@ do
    for index in next,pdfshapes do
     local svgfile=f_svgfile(index)
     local pdffile=f_pdffile(index)
-    pdfshapes[index]=loaddata(pdffile)
+    pdfshapes[index]={
+     data=loaddata(pdffile),
+    }
     remove(svgfile)
     remove(pdffile)
    end
@@ -32410,7 +32416,7 @@ local function initializesvg(tfmdata,kind,value)
   if not pdfshapes or pdffile.timestamp~=timestamp then
    local svgfile=containers.read(otf.svgcache,hash)
    local svgshapes=svgfile and svgfile.svgshapes
-   pdfshapes=svgshapes and otfsvg.topdf(svgshapes) or {}
+   pdfshapes=svgshapes and otfsvg.topdf(svgshapes,tfmdata) or {}
    containers.write(otf.pdfcache,hash,{
     pdfshapes=pdfshapes,
     timestamp=timestamp,