2020-12-15 10:12:00

84 files changed, 11499 insertions, 3127 deletions

diff --git a/context/data/scite/context/lexers/data/scite-context-data-context.lua b/context/data/scite/context/lexers/data/scite-context-data-context.lua
index e81cfa483..34112fbd2 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-context.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-context.lua
@@ -1,4 +1,4 @@
 return {
- ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "pluseleven", "plustwelve", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "percentasciicode", "leftbracketasciicode", "rightbracketasciicode", "frozenhsizecode", "frozenskipcode", "frozenhangcode", "frozenindentcode", "frozenparfillcode", "frozenadjustcode", "frozenprotrudecode", "frozentolerancecode", "frozenstretchcode", "frozenloosenesscode", "frozenlastlinecode", "frozenlinepenaltycode", "frozenclubpenaltycode", "frozenwidowpenaltycode", "frozendisplaypenaltycode", "frozenbrokenpenaltycode", "frozendemeritscode", "frozenshapecode", "frozenlinecode", "frozenallcode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vadjustgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode", "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol", "normalhyphenationmodecode", "automatichyphenationmodecode", "explicithyphenationmodecode", "syllablehyphenationmodecode", "uppercasehyphenationmodecode", "completehyphenationmodecode", "compoundhyphenationmodecode", "strictstarthyphenationmodecode", "strictendhyphenationmodecode", "automaticpenaltyhyphenationmodecode", "explicitpenaltyhyphenationmodecode", "permitgluehyphenationmodecode", "permitallhyphenationmodecode", "permitmathreplacehyphenationmodecode", "normalizelinecode", "parindentskipcode", "swaphangindentcode", "swapparsshapecode", "breakafterdircode", "removemarginkernscode", "noligaturingcode", "nokerningcode", "noleftligaturecode", "noleftkerncode", "norightligaturecode", "norightkerncode", "noexpansioncode", "noprotrusioncode", "frozenflagcode", "tolerantflagcode", "protectedflagcode", "primitiveflagcode", "permanentflagcode", "noalignedflagcode", "immutableflagcode", "mutableflagcode", "globalflagcode", "overloadedflagcode", "immediateflagcode", "conditionalflagcode", "valueflagcode", "instanceflagcode", "continuewhenlmtxmode" },
- ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "nofarguments", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "vpenalty", "hpenalty", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "thebox", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "scratchmacro", "scratchmacroone", "scratchmacrotwo", "scratchconditiontrue", "scratchconditionfalse", "ifscratchcondition", "scratchconditiononetrue", "scratchconditiononefalse", "ifscratchconditionone", "scratchconditiontwotrue", "scratchconditiontwofalse", "ifscratchconditiontwo", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "aliasmacro", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeytabs", "obeypages", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "naturalspace", "controlspace", "normalspaces", "ignoretabs", "ignorelines", "ignorepages", "ignoreeofs", "setcontrolspaces", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "doloopovermatch", "doloopovermatched", "doloopoverlist", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "setconditional", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "ctxluamatch", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "freezeparagraphproperties", "defrostparagraphproperties", "setparagraphfreezing", "forgetparagraphfreezing", "updateparagraphproperties", "updateparagraphpenalties", "updateparagraphdemerits", "updateparagraphshapes", "updateparagraphlines", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "Umathtopaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "compounddiscretionary", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs", "openout", "closeout", "write", "openin", "closein", "read", "readline", "readfromterminal", "boxlines", "boxline", "setboxline", "copyboxline", "boxlinewd", "boxlineht", "boxlinedp", "boxlinenw", "boxlinenh", "boxlinend", "boxlinels", "boxliners", "boxlinelh", "boxlinerh", "boxlinelp", "boxlinerp", "boxlinein", "boxrangewd", "boxrangeht", "boxrangedp", "bitwiseset", "bitwiseand", "bitwiseor", "bitwisexor", "bitwisenot", "bitwisenil", "ifbitwiseand", "bitwise", "bitwiseshift", "bitwiseflip", "textdir", "linedir", "pardir", "boxdir", "prelistbox", "postlistbox", "prelistcopy", "postlistcopy", "setprelistbox", "setpostlistbox", "noligaturing", "nokerning", "noexpansion", "noprotrusion", "futureletnexttoken", "defbackslashbreak", "letbackslashbreak", "pushoverloadmode", "popoverloadmode" },
+ ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "pluseleven", "plustwelve", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "rlncatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "percentasciicode", "leftbracketasciicode", "rightbracketasciicode", "frozenhsizecode", "frozenskipcode", "frozenhangcode", "frozenindentcode", "frozenparfillcode", "frozenadjustcode", "frozenprotrudecode", "frozentolerancecode", "frozenstretchcode", "frozenloosenesscode", "frozenlastlinecode", "frozenlinepenaltycode", "frozenclubpenaltycode", "frozenwidowpenaltycode", "frozendisplaypenaltycode", "frozenbrokenpenaltycode", "frozendemeritscode", "frozenshapecode", "frozenlinecode", "frozenallcode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vadjustgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode", "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol", "normalhyphenationmodecode", "automatichyphenationmodecode", "explicithyphenationmodecode", "syllablehyphenationmodecode", "uppercasehyphenationmodecode", "completehyphenationmodecode", "compoundhyphenationmodecode", "strictstarthyphenationmodecode", "strictendhyphenationmodecode", "automaticpenaltyhyphenationmodecode", "explicitpenaltyhyphenationmodecode", "permitgluehyphenationmodecode", "permitallhyphenationmodecode", "permitmathreplacehyphenationmodecode", "normalizelinecode", "parindentskipcode", "swaphangindentcode", "swapparsshapecode", "breakafterdircode", "removemarginkernscode", "noligaturingcode", "nokerningcode", "noleftligaturecode", "noleftkerncode", "norightligaturecode", "norightkerncode", "noexpansioncode", "noprotrusioncode", "frozenflagcode", "tolerantflagcode", "protectedflagcode", "primitiveflagcode", "permanentflagcode", "noalignedflagcode", "immutableflagcode", "mutableflagcode", "globalflagcode", "overloadedflagcode", "immediateflagcode", "conditionalflagcode", "valueflagcode", "instanceflagcode", "continuewhenlmtxmode" },
+ ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "nofarguments", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "vpenalty", "hpenalty", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "thebox", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "scratchmacro", "scratchmacroone", "scratchmacrotwo", "scratchconditiontrue", "scratchconditionfalse", "ifscratchcondition", "scratchconditiononetrue", "scratchconditiononefalse", "ifscratchconditionone", "scratchconditiontwotrue", "scratchconditiontwofalse", "ifscratchconditiontwo", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "aliasmacro", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeytabs", "obeypages", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "naturalspace", "controlspace", "normalspaces", "ignoretabs", "ignorelines", "ignorepages", "ignoreeofs", "setcontrolspaces", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "doloopovermatch", "doloopovermatched", "doloopoverlist", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "setconditional", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "ctxluamatch", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "freezeparagraphproperties", "defrostparagraphproperties", "setparagraphfreezing", "forgetparagraphfreezing", "updateparagraphproperties", "updateparagraphpenalties", "updateparagraphdemerits", "updateparagraphshapes", "updateparagraphlines", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "Umathtopaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "compounddiscretionary", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs", "openout", "closeout", "write", "openin", "closein", "read", "readline", "readfromterminal", "boxlines", "boxline", "setboxline", "copyboxline", "boxlinewd", "boxlineht", "boxlinedp", "boxlinenw", "boxlinenh", "boxlinend", "boxlinels", "boxliners", "boxlinelh", "boxlinerh", "boxlinelp", "boxlinerp", "boxlinein", "boxrangewd", "boxrangeht", "boxrangedp", "bitwiseset", "bitwiseand", "bitwiseor", "bitwisexor", "bitwisenot", "bitwisenil", "ifbitwiseand", "bitwise", "bitwiseshift", "bitwiseflip", "textdir", "linedir", "pardir", "boxdir", "prelistbox", "postlistbox", "prelistcopy", "postlistcopy", "setprelistbox", "setpostlistbox", "noligaturing", "nokerning", "noexpansion", "noprotrusion", "futureletnexttoken", "defbackslashbreak", "letbackslashbreak", "pushoverloadmode", "popoverloadmode" },
 }
\ No newline at end of file
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 a9ede54c3..46300f356 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", "withopacity", "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", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
+ ["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", "shownshadedirection", "shownshadecenter", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext", "notcached", "keepcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "withopacity", "property", "properties", "withproperties", "asgroup", "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", "lualist", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex", "newscriptindex" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
 }
\ No newline at end of file
diff --git a/context/data/scite/context/lexers/data/scite-context-data-metapost.lua b/context/data/scite/context/lexers/data/scite-context-data-metapost.lua
index 39ab6bde0..1c67ad1cf 100644
--- a/context/data/scite/context/lexers/data/scite-context-data-metapost.lua
+++ b/context/data/scite/context/lexers/data/scite-context-data-metapost.lua
@@ -1,9 +1,9 @@
 return {
- ["commands"]={ "upto", "downto", "beginfig", "endfig", "beginglyph", "endglyph", "rotatedaround", "reflectedabout", "arrowhead", "currentpen", "currentpicture", "cuttings", "defaultfont", "extra_beginfig", "extra_endfig", "down", "evenly", "fullcircle", "halfcircle", "identity", "in", "left", "pensquare", "penrazor", "penspec", "origin", "quartercircle", "right", "unitsquare", "up", "withdots", "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir", "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "round", "unitvector", "whatever", "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot", "loggingall", "interact", "tracingall", "tracingnone", "pickup", "undraw", "unfill", "unfilldraw", "buildcycle", "dashpattern", "decr", "dotlabel", "dotlabels", "drawoptions", "incr", "label", "labels", "max", "min", "thelabel", "z", "beginchar", "blacker", "capsule_end", "change_width", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "endchar", "extra_beginchar", "extra_endchar", "extra_setup", "font_coding_scheme", "clearxy", "clearit", "clearpen", "shipit", "font_extra_space", "exitunless", "relax", "hide", "gobble", "gobbled", "stop", "blankpicture", "counterclockwise", "tensepath", "takepower", "direction", "softjoin", "makelabel", "rotatedabout", "flex", "superellipse", "image", "nullpen", "savepen", "clearpen", "penpos", "penlabels", "range", "thru", "z", "laboff", "bye", "red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background", "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in", "triplet", "quadruplet", "totransform", "bymatrix" },
+ ["commands"]={ "on", "off", "interpath", "upto", "downto", "beginfig", "endfig", "beginglyph", "endglyph", "beginfont", "endfont", "rotatedaround", "reflectedabout", "arrowhead", "currentpen", "currentpicture", "cuttings", "defaultfont", "extra_beginfig", "extra_endfig", "down", "evenly", "fullcircle", "halfcircle", "identity", "in", "left", "pensquare", "penrazor", "penspec", "origin", "quartercircle", "right", "unitsquare", "up", "withdots", "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir", "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "round", "unitvector", "whatever", "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot", "loggingall", "interact", "tracingall", "tracingnone", "pickup", "undraw", "unfill", "unfilldraw", "buildcycle", "dashpattern", "decr", "dotlabel", "dotlabels", "drawoptions", "incr", "label", "labels", "max", "min", "thelabel", "z", "beginchar", "blacker", "capsule_end", "change_width", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "endchar", "extra_beginchar", "extra_endchar", "extra_setup", "font_coding_scheme", "clearxy", "clearit", "clearpen", "shipit", "font_extra_space", "exitunless", "relax", "hide", "gobble", "gobbled", "stop", "blankpicture", "counterclockwise", "tensepath", "takepower", "direction", "softjoin", "makelabel", "rotatedabout", "flex", "superellipse", "image", "nullpen", "savepen", "clearpen", "penpos", "penlabels", "range", "thru", "z", "laboff", "bye", "red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background", "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in", "triplet", "quadruplet", "totransform", "bymatrix", "primitive", "permanent", "immutable", "mutable", "frozen" },
  ["disabled"]={ "verbatimtex", "troffmode" },
  ["internals"]={ "mitered", "rounded", "beveled", "butt", "squared", "eps", "epsilon", "infinity", "bboxmargin", "ahlength", "ahangle", "labeloffset", "dotlabeldiam", "defaultpen", "defaultscale", "join_radius", "charscale", "inicatcoderegime", "texcatcoderegime", "luacatcoderegime", "notcatcoderegime", "vrbcatcoderegime", "prtcatcoderegime", "ctxcatcoderegime", "txtcatcoderegime", "catcoderegime", "ditto", "EOF", "pen_lft", "pen_rt", "pen_top", "pen_bot" },
  ["metafont"]={ "autorounding", "beginchar", "blacker", "boundarychar", "capsule_def", "capsule_end", "change_width", "chardp", "chardx", "chardy", "charexists", "charext", "charht", "charic", "charlist", "charwd", "cull", "cullit", "currenttransform", "currentwindow", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "designsize", "display", "displaying", "endchar", "extensible", "extra_beginchar", "extra_endchar", "extra_setup", "fillin", "font_coding_scheme", "font_extra_space", "font_identifier", "font_normal_shrink", "font_normal_space", "font_normal_stretch", "font_quad", "font_size", "font_slant", "font_x_height", "fontdimen", "fontmaking", "gfcorners", "granularity", "grayfont", "headerbyte", "hppp", "hround", "imagerules", "italcorr", "kern", "labelfont", "ligtable", "lowres_fix", "makebox", "makegrid", "maketicks", "mode_def", "mode_setup", "nodisplays", "notransforms", "numspecial", "o_correction", "openit", "openwindow", "pixels_per_inch", "proofing", "proofoffset", "proofrule", "proofrulethickness", "rulepen", "screenchars", "screenrule", "screenstrokes", "screen_cols", "screen_rows", "showit", "slantfont", "smode", "smoothing", "titlefont", "totalweight", "tracingedges", "tracingpens", "turningcheck", "unitpixel", "vppp", "vround", "xoffset", "yoffset" },
- ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "void", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "setgroup", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "interpath", "on", "off", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "closefrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext", "numbersystem" },
+ ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "void", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "setgroup", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "closefrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext", "numbersystem", "overloadmode", "setproperty" },
  ["shortcuts"]={ "..", "...", "--", "---", "&", "\\" },
  ["tex"]={ "btex", "etex", "verbatimtex" },
 }
\ No newline at end of file
diff --git a/context/data/scite/context/scite-context-data-context.properties b/context/data/scite/context/scite-context-data-context.properties
index 19b6a7765..e94618773 100644
--- a/context/data/scite/context/scite-context-data-context.properties
+++ b/context/data/scite/context/scite-context-data-context.properties
@@ -18,76 +18,76 @@ activecatcode bgroup egroup endline conditionaltrue \
 conditionalfalse attributeunsetvalue uprotationangle rightrotationangle downrotationangle \
 leftrotationangle inicatcodes ctxcatcodes texcatcodes notcatcodes \
 txtcatcodes vrbcatcodes prtcatcodes nilcatcodes luacatcodes \
-tpacatcodes tpbcatcodes xmlcatcodes ctdcatcodes escapecatcode \
-begingroupcatcode endgroupcatcode mathshiftcatcode alignmentcatcode endoflinecatcode \
-parametercatcode superscriptcatcode subscriptcatcode ignorecatcode spacecatcode \
-lettercatcode othercatcode activecatcode commentcatcode invalidcatcode \
-tabasciicode newlineasciicode formfeedasciicode endoflineasciicode endoffileasciicode \
-commaasciicode spaceasciicode periodasciicode hashasciicode dollarasciicode \
-commentasciicode ampersandasciicode colonasciicode backslashasciicode circumflexasciicode \
-underscoreasciicode leftbraceasciicode barasciicode rightbraceasciicode tildeasciicode \
-delasciicode leftparentasciicode rightparentasciicode lessthanasciicode morethanasciicode \
-doublecommentsignal atsignasciicode exclamationmarkasciicode questionmarkasciicode doublequoteasciicode \
-singlequoteasciicode forwardslashasciicode primeasciicode hyphenasciicode percentasciicode \
-leftbracketasciicode rightbracketasciicode frozenhsizecode frozenskipcode frozenhangcode \
-frozenindentcode frozenparfillcode frozenadjustcode frozenprotrudecode frozentolerancecode \
-frozenstretchcode frozenloosenesscode frozenlastlinecode frozenlinepenaltycode frozenclubpenaltycode \
-frozenwidowpenaltycode frozendisplaypenaltycode frozenbrokenpenaltycode frozendemeritscode frozenshapecode \
-frozenlinecode frozenallcode activemathcharcode activetabtoken activeformfeedtoken \
-activeendoflinetoken batchmodecode nonstopmodecode scrollmodecode errorstopmodecode \
-bottomlevelgroupcode simplegroupcode hboxgroupcode adjustedhboxgroupcode vboxgroupcode \
-vtopgroupcode aligngroupcode noaligngroupcode outputgroupcode mathgroupcode \
-discretionarygroupcode insertgroupcode vadjustgroupcode vcentergroupcode mathabovegroupcode \
-mathchoicegroupcode semisimplegroupcode mathshiftgroupcode mathleftgroupcode localboxgroupcode \
-splitoffgroupcode splitkeepgroupcode preamblegroupcode alignsetgroupcode finrowgroupcode \
-discretionarygroupcode charnodecode hlistnodecode vlistnodecode rulenodecode \
-insertnodecode marknodecode adjustnodecode ligaturenodecode discretionarynodecode \
-whatsitnodecode mathnodecode gluenodecode kernnodecode penaltynodecode \
-unsetnodecode mathsnodecode charifcode catifcode numifcode \
-dimifcode oddifcode vmodeifcode hmodeifcode mmodeifcode \
-innerifcode voidifcode hboxifcode vboxifcode xifcode \
-eofifcode trueifcode falseifcode caseifcode definedifcode \
-csnameifcode fontcharifcode fontslantperpoint fontinterwordspace fontinterwordstretch \
-fontinterwordshrink fontexheight fontemwidth fontextraspace slantperpoint \
-mathexheight mathemwidth interwordspace interwordstretch interwordshrink \
-exheight emwidth extraspace mathaxisheight muquad \
-startmode stopmode startnotmode stopnotmode startmodeset \
-stopmodeset doifmode doifelsemode doifmodeelse doifnotmode \
-startmodeset stopmodeset startallmodes stopallmodes startnotallmodes \
-stopnotallmodes doifallmodes doifelseallmodes doifallmodeselse doifnotallmodes \
-startenvironment stopenvironment environment startcomponent stopcomponent \
-component startproduct stopproduct product startproject \
-stopproject project starttext stoptext startnotext \
-stopnotext startdocument stopdocument documentvariable unexpandeddocumentvariable \
-setupdocument presetdocument doifelsedocumentvariable doifdocumentvariableelse doifdocumentvariable \
-doifnotdocumentvariable startmodule stopmodule usemodule usetexmodule \
-useluamodule setupmodule currentmoduleparameter moduleparameter everystarttext \
-everystoptext startTEXpage stopTEXpage enablemode disablemode \
-preventmode definemode globalenablemode globaldisablemode globalpreventmode \
-pushmode popmode typescriptone typescripttwo typescriptthree \
-mathsizesuffix mathordcode mathopcode mathbincode mathrelcode \
-mathopencode mathclosecode mathpunctcode mathalphacode mathinnercode \
-mathnothingcode mathlimopcode mathnolopcode mathboxcode mathchoicecode \
-mathaccentcode mathradicalcode constantnumber constantnumberargument constantdimen \
-constantdimenargument constantemptyargument continueifinputfile luastringsep !!bs \
-!!es lefttorightmark righttoleftmark lrm rlm \
-bidilre bidirle bidipop bidilro bidirlo \
-breakablethinspace nobreakspace nonbreakablespace narrownobreakspace zerowidthnobreakspace \
-ideographicspace ideographichalffillspace twoperemspace threeperemspace fourperemspace \
-fiveperemspace sixperemspace figurespace punctuationspace hairspace \
-enquad emquad zerowidthspace zerowidthnonjoiner zerowidthjoiner \
-zwnj zwj optionalspace asciispacechar softhyphen \
-Ux eUx Umathaccents parfillleftskip parfillrightskip \
-startlmtxmode stoplmtxmode startmkivmode stopmkivmode wildcardsymbol \
-normalhyphenationmodecode automatichyphenationmodecode explicithyphenationmodecode syllablehyphenationmodecode uppercasehyphenationmodecode \
-completehyphenationmodecode compoundhyphenationmodecode strictstarthyphenationmodecode strictendhyphenationmodecode automaticpenaltyhyphenationmodecode \
-explicitpenaltyhyphenationmodecode permitgluehyphenationmodecode permitallhyphenationmodecode permitmathreplacehyphenationmodecode normalizelinecode \
-parindentskipcode swaphangindentcode swapparsshapecode breakafterdircode removemarginkernscode \
-noligaturingcode nokerningcode noleftligaturecode noleftkerncode norightligaturecode \
-norightkerncode noexpansioncode noprotrusioncode frozenflagcode tolerantflagcode \
-protectedflagcode primitiveflagcode permanentflagcode noalignedflagcode immutableflagcode \
-mutableflagcode globalflagcode overloadedflagcode immediateflagcode conditionalflagcode \
-valueflagcode instanceflagcode continuewhenlmtxmode 
+tpacatcodes tpbcatcodes xmlcatcodes ctdcatcodes rlncatcodes \
+escapecatcode begingroupcatcode endgroupcatcode mathshiftcatcode alignmentcatcode \
+endoflinecatcode parametercatcode superscriptcatcode subscriptcatcode ignorecatcode \
+spacecatcode lettercatcode othercatcode activecatcode commentcatcode \
+invalidcatcode tabasciicode newlineasciicode formfeedasciicode endoflineasciicode \
+endoffileasciicode commaasciicode spaceasciicode periodasciicode hashasciicode \
+dollarasciicode commentasciicode ampersandasciicode colonasciicode backslashasciicode \
+circumflexasciicode underscoreasciicode leftbraceasciicode barasciicode rightbraceasciicode \
+tildeasciicode delasciicode leftparentasciicode rightparentasciicode lessthanasciicode \
+morethanasciicode doublecommentsignal atsignasciicode exclamationmarkasciicode questionmarkasciicode \
+doublequoteasciicode singlequoteasciicode forwardslashasciicode primeasciicode hyphenasciicode \
+percentasciicode leftbracketasciicode rightbracketasciicode frozenhsizecode frozenskipcode \
+frozenhangcode frozenindentcode frozenparfillcode frozenadjustcode frozenprotrudecode \
+frozentolerancecode frozenstretchcode frozenloosenesscode frozenlastlinecode frozenlinepenaltycode \
+frozenclubpenaltycode frozenwidowpenaltycode frozendisplaypenaltycode frozenbrokenpenaltycode frozendemeritscode \
+frozenshapecode frozenlinecode frozenallcode activemathcharcode activetabtoken \
+activeformfeedtoken activeendoflinetoken batchmodecode nonstopmodecode scrollmodecode \
+errorstopmodecode bottomlevelgroupcode simplegroupcode hboxgroupcode adjustedhboxgroupcode \
+vboxgroupcode vtopgroupcode aligngroupcode noaligngroupcode outputgroupcode \
+mathgroupcode discretionarygroupcode insertgroupcode vadjustgroupcode vcentergroupcode \
+mathabovegroupcode mathchoicegroupcode semisimplegroupcode mathshiftgroupcode mathleftgroupcode \
+localboxgroupcode splitoffgroupcode splitkeepgroupcode preamblegroupcode alignsetgroupcode \
+finrowgroupcode discretionarygroupcode charnodecode hlistnodecode vlistnodecode \
+rulenodecode insertnodecode marknodecode adjustnodecode ligaturenodecode \
+discretionarynodecode whatsitnodecode mathnodecode gluenodecode kernnodecode \
+penaltynodecode unsetnodecode mathsnodecode charifcode catifcode \
+numifcode dimifcode oddifcode vmodeifcode hmodeifcode \
+mmodeifcode innerifcode voidifcode hboxifcode vboxifcode \
+xifcode eofifcode trueifcode falseifcode caseifcode \
+definedifcode csnameifcode fontcharifcode fontslantperpoint fontinterwordspace \
+fontinterwordstretch fontinterwordshrink fontexheight fontemwidth fontextraspace \
+slantperpoint mathexheight mathemwidth interwordspace interwordstretch \
+interwordshrink exheight emwidth extraspace mathaxisheight \
+muquad startmode stopmode startnotmode stopnotmode \
+startmodeset stopmodeset doifmode doifelsemode doifmodeelse \
+doifnotmode startmodeset stopmodeset startallmodes stopallmodes \
+startnotallmodes stopnotallmodes doifallmodes doifelseallmodes doifallmodeselse \
+doifnotallmodes startenvironment stopenvironment environment startcomponent \
+stopcomponent component startproduct stopproduct product \
+startproject stopproject project starttext stoptext \
+startnotext stopnotext startdocument stopdocument documentvariable \
+unexpandeddocumentvariable setupdocument presetdocument doifelsedocumentvariable doifdocumentvariableelse \
+doifdocumentvariable doifnotdocumentvariable startmodule stopmodule usemodule \
+usetexmodule useluamodule setupmodule currentmoduleparameter moduleparameter \
+everystarttext everystoptext startTEXpage stopTEXpage enablemode \
+disablemode preventmode definemode globalenablemode globaldisablemode \
+globalpreventmode pushmode popmode typescriptone typescripttwo \
+typescriptthree mathsizesuffix mathordcode mathopcode mathbincode \
+mathrelcode mathopencode mathclosecode mathpunctcode mathalphacode \
+mathinnercode mathnothingcode mathlimopcode mathnolopcode mathboxcode \
+mathchoicecode mathaccentcode mathradicalcode constantnumber constantnumberargument \
+constantdimen constantdimenargument constantemptyargument continueifinputfile luastringsep \
+!!bs !!es lefttorightmark righttoleftmark lrm \
+rlm bidilre bidirle bidipop bidilro \
+bidirlo breakablethinspace nobreakspace nonbreakablespace narrownobreakspace \
+zerowidthnobreakspace ideographicspace ideographichalffillspace twoperemspace threeperemspace \
+fourperemspace fiveperemspace sixperemspace figurespace punctuationspace \
+hairspace enquad emquad zerowidthspace zerowidthnonjoiner \
+zerowidthjoiner zwnj zwj optionalspace asciispacechar \
+softhyphen Ux eUx Umathaccents parfillleftskip \
+parfillrightskip startlmtxmode stoplmtxmode startmkivmode stopmkivmode \
+wildcardsymbol normalhyphenationmodecode automatichyphenationmodecode explicithyphenationmodecode syllablehyphenationmodecode \
+uppercasehyphenationmodecode completehyphenationmodecode compoundhyphenationmodecode strictstarthyphenationmodecode strictendhyphenationmodecode \
+automaticpenaltyhyphenationmodecode explicitpenaltyhyphenationmodecode permitgluehyphenationmodecode permitallhyphenationmodecode permitmathreplacehyphenationmodecode \
+normalizelinecode parindentskipcode swaphangindentcode swapparsshapecode breakafterdircode \
+removemarginkernscode noligaturingcode nokerningcode noleftligaturecode noleftkerncode \
+norightligaturecode norightkerncode noexpansioncode noprotrusioncode frozenflagcode \
+tolerantflagcode protectedflagcode primitiveflagcode permanentflagcode noalignedflagcode \
+immutableflagcode mutableflagcode globalflagcode overloadedflagcode immediateflagcode \
+conditionalflagcode valueflagcode instanceflagcode continuewhenlmtxmode 
 
 keywordclass.context.helpers=\
 startsetups stopsetups startxmlsetups stopxmlsetups \
@@ -185,98 +185,98 @@ quantity quantitied directquantity installcorenamespace getvalue \
 getuvalue setvalue setevalue setgvalue setxvalue \
 letvalue letgvalue resetvalue undefinevalue ignorevalue \
 setuvalue setuevalue setugvalue setuxvalue globallet \
-glet udef ugdef uedef uxdef \
-checked unique getparameters geteparameters getgparameters \
-getxparameters forgetparameters copyparameters getdummyparameters dummyparameter \
-directdummyparameter setdummyparameter letdummyparameter setexpandeddummyparameter usedummystyleandcolor \
-usedummystyleparameter usedummycolorparameter processcommalist processcommacommand quitcommalist \
-quitprevcommalist processaction processallactions processfirstactioninset processallactionsinset \
-unexpanded expanded startexpanded stopexpanded protect \
-unprotect firstofoneargument firstoftwoarguments secondoftwoarguments firstofthreearguments \
-secondofthreearguments thirdofthreearguments firstoffourarguments secondoffourarguments thirdoffourarguments \
-fourthoffourarguments firstoffivearguments secondoffivearguments thirdoffivearguments fourthoffivearguments \
-fifthoffivearguments firstofsixarguments secondofsixarguments thirdofsixarguments fourthofsixarguments \
-fifthofsixarguments sixthofsixarguments firstofoneunexpanded firstoftwounexpanded secondoftwounexpanded \
-firstofthreeunexpanded secondofthreeunexpanded thirdofthreeunexpanded gobbleoneargument gobbletwoarguments \
-gobblethreearguments gobblefourarguments gobblefivearguments gobblesixarguments gobblesevenarguments \
-gobbleeightarguments gobbleninearguments gobbletenarguments gobbleoneoptional gobbletwooptionals \
-gobblethreeoptionals gobblefouroptionals gobblefiveoptionals dorecurse doloop \
-exitloop dostepwiserecurse recurselevel recursedepth dofastloopcs \
-fastloopindex fastloopfinal dowith doloopovermatch doloopovermatched \
-doloopoverlist newconstant setnewconstant setconstant setconstantvalue \
-newconditional settrue setfalse settruevalue setfalsevalue \
-setconditional newmacro setnewmacro newfraction newsignal \
-dosingleempty dodoubleempty dotripleempty doquadrupleempty doquintupleempty \
-dosixtupleempty doseventupleempty dosingleargument dodoubleargument dotripleargument \
-doquadrupleargument doquintupleargument dosixtupleargument doseventupleargument dosinglegroupempty \
-dodoublegroupempty dotriplegroupempty doquadruplegroupempty doquintuplegroupempty permitspacesbetweengroups \
-dontpermitspacesbetweengroups nopdfcompression maximumpdfcompression normalpdfcompression onlypdfobjectcompression \
-nopdfobjectcompression modulonumber dividenumber getfirstcharacter doifelsefirstchar \
-doiffirstcharelse startnointerference stopnointerference twodigits threedigits \
-leftorright offinterlineskip oninterlineskip nointerlineskip strut \
-halfstrut quarterstrut depthstrut halflinestrut noheightstrut \
-setstrut strutbox strutht strutdp strutwd \
-struthtdp strutgap begstrut endstrut lineheight \
-leftboundary rightboundary signalcharacter shiftbox vpackbox \
-hpackbox vpackedbox hpackedbox ordordspacing ordopspacing \
-ordbinspacing ordrelspacing ordopenspacing ordclosespacing ordpunctspacing \
-ordinnerspacing opordspacing opopspacing opbinspacing oprelspacing \
-opopenspacing opclosespacing oppunctspacing opinnerspacing binordspacing \
-binopspacing binbinspacing binrelspacing binopenspacing binclosespacing \
-binpunctspacing bininnerspacing relordspacing relopspacing relbinspacing \
-relrelspacing relopenspacing relclosespacing relpunctspacing relinnerspacing \
-openordspacing openopspacing openbinspacing openrelspacing openopenspacing \
-openclosespacing openpunctspacing openinnerspacing closeordspacing closeopspacing \
-closebinspacing closerelspacing closeopenspacing closeclosespacing closepunctspacing \
-closeinnerspacing punctordspacing punctopspacing punctbinspacing punctrelspacing \
-punctopenspacing punctclosespacing punctpunctspacing punctinnerspacing innerordspacing \
-inneropspacing innerbinspacing innerrelspacing inneropenspacing innerclosespacing \
-innerpunctspacing innerinnerspacing normalreqno startimath stopimath \
-normalstartimath normalstopimath startdmath stopdmath normalstartdmath \
-normalstopdmath normalsuperscript normalsubscript normalnosuperscript normalnosubscript \
-superscript subscript nosuperscript nosubscript superprescript \
-subprescript nosuperprescript nosubsprecript uncramped cramped \
-mathstyletrigger triggermathstyle mathstylefont mathsmallstylefont mathstyleface \
-mathsmallstyleface mathstylecommand mathpalette mathstylehbox mathstylevbox \
-mathstylevcenter mathstylevcenteredhbox mathstylevcenteredvbox mathtext setmathsmalltextbox \
-setmathtextbox pushmathstyle popmathstyle triggerdisplaystyle triggertextstyle \
-triggerscriptstyle triggerscriptscriptstyle triggeruncrampedstyle triggercrampedstyle triggersmallstyle \
-triggeruncrampedsmallstyle triggercrampedsmallstyle triggerbigstyle triggeruncrampedbigstyle triggercrampedbigstyle \
-luaexpr expelsedoif expdoif expdoifnot expdoifelsecommon \
-expdoifcommonelse expdoifelseinset expdoifinsetelse ctxdirectlua ctxlatelua \
-ctxsprint ctxwrite ctxcommand ctxdirectcommand ctxlatecommand \
-ctxreport ctxlua luacode lateluacode directluacode \
-registerctxluafile ctxloadluafile luaversion luamajorversion luaminorversion \
-ctxluacode luaconditional luaexpanded ctxluamatch startluaparameterset \
-stopluaparameterset luaparameterset definenamedlua obeylualines obeyluatokens \
-startluacode stopluacode startlua stoplua startctxfunction \
-stopctxfunction ctxfunction startctxfunctiondefinition stopctxfunctiondefinition installctxfunction \
-installprotectedctxfunction installprotectedctxscanner installctxscanner resetctxscanner cldprocessfile \
-cldloadfile cldloadviafile cldcontext cldcommand carryoverpar \
-freezeparagraphproperties defrostparagraphproperties setparagraphfreezing forgetparagraphfreezing updateparagraphproperties \
-updateparagraphpenalties updateparagraphdemerits updateparagraphshapes updateparagraphlines lastlinewidth \
-assumelongusagecs Umathbotaccent Umathtopaccent righttolefthbox lefttorighthbox \
-righttoleftvbox lefttorightvbox righttoleftvtop lefttorightvtop rtlhbox \
-ltrhbox rtlvbox ltrvbox rtlvtop ltrvtop \
-autodirhbox autodirvbox autodirvtop leftorrighthbox leftorrightvbox \
-leftorrightvtop lefttoright righttoleft checkedlefttoright checkedrighttoleft \
-synchronizelayoutdirection synchronizedisplaydirection synchronizeinlinedirection dirlre dirrle \
-dirlro dirrlo lesshyphens morehyphens nohyphens \
-dohyphens compounddiscretionary Ucheckedstartdisplaymath Ucheckedstopdisplaymath break \
-nobreak allowbreak goodbreak nospace nospacing \
-dospacing naturalhbox naturalvbox naturalvtop naturalhpack \
-naturalvpack naturaltpack reversehbox reversevbox reversevtop \
-reversehpack reversevpack reversetpack frule compoundhyphenpenalty \
-start stop unsupportedcs openout closeout \
-write openin closein read readline \
-readfromterminal boxlines boxline setboxline copyboxline \
-boxlinewd boxlineht boxlinedp boxlinenw boxlinenh \
-boxlinend boxlinels boxliners boxlinelh boxlinerh \
-boxlinelp boxlinerp boxlinein boxrangewd boxrangeht \
-boxrangedp bitwiseset bitwiseand bitwiseor bitwisexor \
-bitwisenot bitwisenil ifbitwiseand bitwise bitwiseshift \
-bitwiseflip textdir linedir pardir boxdir \
-prelistbox postlistbox prelistcopy postlistcopy setprelistbox \
-setpostlistbox noligaturing nokerning noexpansion noprotrusion \
-futureletnexttoken defbackslashbreak letbackslashbreak pushoverloadmode popoverloadmode 
+udef ugdef uedef uxdef checked \
+unique getparameters geteparameters getgparameters getxparameters \
+forgetparameters copyparameters getdummyparameters dummyparameter directdummyparameter \
+setdummyparameter letdummyparameter setexpandeddummyparameter usedummystyleandcolor usedummystyleparameter \
+usedummycolorparameter processcommalist processcommacommand quitcommalist quitprevcommalist \
+processaction processallactions processfirstactioninset processallactionsinset unexpanded \
+expanded startexpanded stopexpanded protect unprotect \
+firstofoneargument firstoftwoarguments secondoftwoarguments firstofthreearguments secondofthreearguments \
+thirdofthreearguments firstoffourarguments secondoffourarguments thirdoffourarguments fourthoffourarguments \
+firstoffivearguments secondoffivearguments thirdoffivearguments fourthoffivearguments fifthoffivearguments \
+firstofsixarguments secondofsixarguments thirdofsixarguments fourthofsixarguments fifthofsixarguments \
+sixthofsixarguments firstofoneunexpanded firstoftwounexpanded secondoftwounexpanded firstofthreeunexpanded \
+secondofthreeunexpanded thirdofthreeunexpanded gobbleoneargument gobbletwoarguments gobblethreearguments \
+gobblefourarguments gobblefivearguments gobblesixarguments gobblesevenarguments gobbleeightarguments \
+gobbleninearguments gobbletenarguments gobbleoneoptional gobbletwooptionals gobblethreeoptionals \
+gobblefouroptionals gobblefiveoptionals dorecurse doloop exitloop \
+dostepwiserecurse recurselevel recursedepth dofastloopcs fastloopindex \
+fastloopfinal dowith doloopovermatch doloopovermatched doloopoverlist \
+newconstant setnewconstant setconstant setconstantvalue newconditional \
+settrue setfalse settruevalue setfalsevalue setconditional \
+newmacro setnewmacro newfraction newsignal dosingleempty \
+dodoubleempty dotripleempty doquadrupleempty doquintupleempty dosixtupleempty \
+doseventupleempty dosingleargument dodoubleargument dotripleargument doquadrupleargument \
+doquintupleargument dosixtupleargument doseventupleargument dosinglegroupempty dodoublegroupempty \
+dotriplegroupempty doquadruplegroupempty doquintuplegroupempty permitspacesbetweengroups dontpermitspacesbetweengroups \
+nopdfcompression maximumpdfcompression normalpdfcompression onlypdfobjectcompression nopdfobjectcompression \
+modulonumber dividenumber getfirstcharacter doifelsefirstchar doiffirstcharelse \
+startnointerference stopnointerference twodigits threedigits leftorright \
+offinterlineskip oninterlineskip nointerlineskip strut halfstrut \
+quarterstrut depthstrut halflinestrut noheightstrut setstrut \
+strutbox strutht strutdp strutwd struthtdp \
+strutgap begstrut endstrut lineheight leftboundary \
+rightboundary signalcharacter shiftbox vpackbox hpackbox \
+vpackedbox hpackedbox ordordspacing ordopspacing ordbinspacing \
+ordrelspacing ordopenspacing ordclosespacing ordpunctspacing ordinnerspacing \
+opordspacing opopspacing opbinspacing oprelspacing opopenspacing \
+opclosespacing oppunctspacing opinnerspacing binordspacing binopspacing \
+binbinspacing binrelspacing binopenspacing binclosespacing binpunctspacing \
+bininnerspacing relordspacing relopspacing relbinspacing relrelspacing \
+relopenspacing relclosespacing relpunctspacing relinnerspacing openordspacing \
+openopspacing openbinspacing openrelspacing openopenspacing openclosespacing \
+openpunctspacing openinnerspacing closeordspacing closeopspacing closebinspacing \
+closerelspacing closeopenspacing closeclosespacing closepunctspacing closeinnerspacing \
+punctordspacing punctopspacing punctbinspacing punctrelspacing punctopenspacing \
+punctclosespacing punctpunctspacing punctinnerspacing innerordspacing inneropspacing \
+innerbinspacing innerrelspacing inneropenspacing innerclosespacing innerpunctspacing \
+innerinnerspacing normalreqno startimath stopimath normalstartimath \
+normalstopimath startdmath stopdmath normalstartdmath normalstopdmath \
+normalsuperscript normalsubscript normalnosuperscript normalnosubscript superscript \
+subscript nosuperscript nosubscript superprescript subprescript \
+nosuperprescript nosubsprecript uncramped cramped mathstyletrigger \
+triggermathstyle mathstylefont mathsmallstylefont mathstyleface mathsmallstyleface \
+mathstylecommand mathpalette mathstylehbox mathstylevbox mathstylevcenter \
+mathstylevcenteredhbox mathstylevcenteredvbox mathtext setmathsmalltextbox setmathtextbox \
+pushmathstyle popmathstyle triggerdisplaystyle triggertextstyle triggerscriptstyle \
+triggerscriptscriptstyle triggeruncrampedstyle triggercrampedstyle triggersmallstyle triggeruncrampedsmallstyle \
+triggercrampedsmallstyle triggerbigstyle triggeruncrampedbigstyle triggercrampedbigstyle luaexpr \
+expelsedoif expdoif expdoifnot expdoifelsecommon expdoifcommonelse \
+expdoifelseinset expdoifinsetelse ctxdirectlua ctxlatelua ctxsprint \
+ctxwrite ctxcommand ctxdirectcommand ctxlatecommand ctxreport \
+ctxlua luacode lateluacode directluacode registerctxluafile \
+ctxloadluafile luaversion luamajorversion luaminorversion ctxluacode \
+luaconditional luaexpanded ctxluamatch startluaparameterset stopluaparameterset \
+luaparameterset definenamedlua obeylualines obeyluatokens startluacode \
+stopluacode startlua stoplua startctxfunction stopctxfunction \
+ctxfunction startctxfunctiondefinition stopctxfunctiondefinition installctxfunction installprotectedctxfunction \
+installprotectedctxscanner installctxscanner resetctxscanner cldprocessfile cldloadfile \
+cldloadviafile cldcontext cldcommand carryoverpar freezeparagraphproperties \
+defrostparagraphproperties setparagraphfreezing forgetparagraphfreezing updateparagraphproperties updateparagraphpenalties \
+updateparagraphdemerits updateparagraphshapes updateparagraphlines lastlinewidth assumelongusagecs \
+Umathbotaccent Umathtopaccent righttolefthbox lefttorighthbox righttoleftvbox \
+lefttorightvbox righttoleftvtop lefttorightvtop rtlhbox ltrhbox \
+rtlvbox ltrvbox rtlvtop ltrvtop autodirhbox \
+autodirvbox autodirvtop leftorrighthbox leftorrightvbox leftorrightvtop \
+lefttoright righttoleft checkedlefttoright checkedrighttoleft synchronizelayoutdirection \
+synchronizedisplaydirection synchronizeinlinedirection dirlre dirrle dirlro \
+dirrlo lesshyphens morehyphens nohyphens dohyphens \
+compounddiscretionary Ucheckedstartdisplaymath Ucheckedstopdisplaymath break nobreak \
+allowbreak goodbreak nospace nospacing dospacing \
+naturalhbox naturalvbox naturalvtop naturalhpack naturalvpack \
+naturaltpack reversehbox reversevbox reversevtop reversehpack \
+reversevpack reversetpack frule compoundhyphenpenalty start \
+stop unsupportedcs openout closeout write \
+openin closein read readline readfromterminal \
+boxlines boxline setboxline copyboxline boxlinewd \
+boxlineht boxlinedp boxlinenw boxlinenh boxlinend \
+boxlinels boxliners boxlinelh boxlinerh boxlinelp \
+boxlinerp boxlinein boxrangewd boxrangeht boxrangedp \
+bitwiseset bitwiseand bitwiseor bitwisexor bitwisenot \
+bitwisenil ifbitwiseand bitwise bitwiseshift bitwiseflip \
+textdir linedir pardir boxdir prelistbox \
+postlistbox prelistcopy postlistcopy setprelistbox setpostlistbox \
+noligaturing nokerning noexpansion noprotrusion futureletnexttoken \
+defbackslashbreak letbackslashbreak pushoverloadmode popoverloadmode 
 
diff --git a/context/data/scite/context/scite-context-data-metafun.properties b/context/data/scite/context/scite-context-data-metafun.properties
index 325d61a3b..9dc9e6579 100644
--- a/context/data/scite/context/scite-context-data-metafun.properties
+++ b/context/data/scite/context/scite-context-data-metafun.properties
@@ -28,63 +28,65 @@ 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 withopacity \
-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 
+shownshadedirection shownshadecenter cmyk spotcolor multitonecolor \
+namedcolor drawfill undrawfill inverted uncolored \
+softened grayed greyed onlayer along \
+graphictext loadfigure externalfigure figure register \
+outlinetext filloutlinetext drawoutlinetext outlinetexttopath checkedbounds \
+checkbounds strut rule withmask bitmapimage \
+colordecimals ddecimal dddecimal ddddecimal colordecimalslist \
+textext thetextext rawtextext textextoffset texbox \
+thetexbox rawtexbox istextext rawmadetext validtexbox \
+onetimetextext rawfmttext thefmttext fmttext onetimefmttext \
+notcached keepcached verbatim thelabel label \
+autoalign transparent withtransparency withopacity property \
+properties withproperties asgroup 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 lualist mp MP \
+luacall mirrored mirroredabout scriptindex newscriptindex 
 
 keywordclass.metafun.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 getparameterpen getparametertext applyparameters pushparameters \
-popparameters definecolor 
+cmykcolormodel shadefactor shadeoffset textextoffset textextanchor \
+normaltransparent multiplytransparent screentransparent overlaytransparent softlighttransparent \
+hardlighttransparent colordodgetransparent colorburntransparent darkentransparent lightentransparent \
+differencetransparent exclusiontransparent huetransparent saturationtransparent colortransparent \
+luminositytransparent ahvariant ahdimple ahfactor ahscale \
+metapostversion maxdimensions drawoptionsfactor dq sq \
+crossingscale crossingoption contextlmtxmode metafunversion getparameters \
+presetparameters hasparameter hasoption getparameter getparameterdefault \
+getparametercount getmaxparametercount getparameterpath getparameterpen getparametertext \
+applyparameters pushparameters popparameters definecolor 
 
diff --git a/context/data/scite/context/scite-context-data-metapost.properties b/context/data/scite/context/scite-context-data-metapost.properties
index 619fbe9d3..16c84b0a8 100644
--- a/context/data/scite/context/scite-context-data-metapost.properties
+++ b/context/data/scite/context/scite-context-data-metapost.properties
@@ -1,6 +1,7 @@
 keywordclass.metapost.commands=\
-upto downto beginfig endfig \
-beginglyph endglyph rotatedaround reflectedabout arrowhead \
+on off interpath upto \
+downto beginfig endfig beginglyph endglyph \
+beginfont endfont rotatedaround reflectedabout arrowhead \
 currentpen currentpicture cuttings defaultfont extra_beginfig \
 extra_endfig down evenly fullcircle halfcircle \
 identity in left pensquare penrazor \
@@ -28,7 +29,8 @@ laboff bye red green blue \
 cyan magenta yellow black white \
 background mm pt dd bp \
 cm pc cc in triplet \
-quadruplet totransform bymatrix 
+quadruplet totransform bymatrix primitive permanent \
+immutable mutable frozen 
 
 keywordclass.metapost.disabled=\
 verbatimtex troffmode 
@@ -89,37 +91,37 @@ clip input interim let newinternal \
 save setbounds setgroup shipout show \
 showdependencies showtoken showvariable special begingroup \
 endgroup of curl tension and \
-controls interpath on off def \
-vardef enddef expr suffix text \
-primary secondary tertiary primarydef secondarydef \
-tertiarydef randomseed also contour doublepath \
-withcolor withcmykcolor withpen dashed envelope \
-if else elseif fi for \
-endfor forever exitif within forsuffixes \
-step until charlist extensible fontdimen \
-headerbyte kern ligtable boundarychar chardp \
-charext charht charic charwd designsize \
-fontmaking charexists cullit currenttransform gfcorners \
-grayfont hround imagerules lowres_fix nodisplays \
-notransforms openit displaying currentwindow screen_rows \
-screen_cols pixels_per_inch cull display openwindow \
-numspecial totalweight autorounding fillin proofing \
-tracingpens xoffset chardx granularity smoothing \
-turningcheck yoffset chardy hppp tracingedges \
-vppp extra_beginfig extra_endfig mpxbreak endinput \
-message delimiters turningnumber errmessage scantokens \
-end outer inner write to \
-readfrom closefrom withprescript withpostscript top \
-bot lft rt ulft urt \
-llft lrt redpart greenpart bluepart \
-cyanpart magentapart yellowpart blackpart prescriptpart \
-postscriptpart rgbcolor cmykcolor colormodel graypart \
-greypart greycolor graycolor dashpart penpart \
-stroked filled textual clipped bounded \
-pathpart expandafter minute hour outputformat \
-outputtemplate filenametemplate fontmapfile fontmapline fontpart \
-fontsize glyph restoreclipcolor troffmode runscript \
-maketext numbersystem 
+controls def vardef enddef expr \
+suffix text primary secondary tertiary \
+primarydef secondarydef tertiarydef randomseed also \
+contour doublepath withcolor withcmykcolor withpen \
+dashed envelope if else elseif \
+fi for endfor forever exitif \
+within forsuffixes step until charlist \
+extensible fontdimen headerbyte kern ligtable \
+boundarychar chardp charext charht charic \
+charwd designsize fontmaking charexists cullit \
+currenttransform gfcorners grayfont hround imagerules \
+lowres_fix nodisplays notransforms openit displaying \
+currentwindow screen_rows screen_cols pixels_per_inch cull \
+display openwindow numspecial totalweight autorounding \
+fillin proofing tracingpens xoffset chardx \
+granularity smoothing turningcheck yoffset chardy \
+hppp tracingedges vppp extra_beginfig extra_endfig \
+mpxbreak endinput message delimiters turningnumber \
+errmessage scantokens end outer inner \
+write to readfrom closefrom withprescript \
+withpostscript top bot lft rt \
+ulft urt llft lrt redpart \
+greenpart bluepart cyanpart magentapart yellowpart \
+blackpart prescriptpart postscriptpart rgbcolor cmykcolor \
+colormodel graypart greypart greycolor graycolor \
+dashpart penpart stroked filled textual \
+clipped bounded pathpart expandafter minute \
+hour outputformat outputtemplate filenametemplate fontmapfile \
+fontmapline fontpart fontsize glyph restoreclipcolor \
+troffmode runscript maketext numbersystem overloadmode \
+setproperty 
 
 keywordclass.metapost.shortcuts=\
 .. ... -- --- \
diff --git a/context/data/textadept/context/data/scite-context-data-context.lua b/context/data/textadept/context/data/scite-context-data-context.lua
index e81cfa483..34112fbd2 100644
--- a/context/data/textadept/context/data/scite-context-data-context.lua
+++ b/context/data/textadept/context/data/scite-context-data-context.lua
@@ -1,4 +1,4 @@
 return {
- ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "pluseleven", "plustwelve", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "percentasciicode", "leftbracketasciicode", "rightbracketasciicode", "frozenhsizecode", "frozenskipcode", "frozenhangcode", "frozenindentcode", "frozenparfillcode", "frozenadjustcode", "frozenprotrudecode", "frozentolerancecode", "frozenstretchcode", "frozenloosenesscode", "frozenlastlinecode", "frozenlinepenaltycode", "frozenclubpenaltycode", "frozenwidowpenaltycode", "frozendisplaypenaltycode", "frozenbrokenpenaltycode", "frozendemeritscode", "frozenshapecode", "frozenlinecode", "frozenallcode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vadjustgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode", "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol", "normalhyphenationmodecode", "automatichyphenationmodecode", "explicithyphenationmodecode", "syllablehyphenationmodecode", "uppercasehyphenationmodecode", "completehyphenationmodecode", "compoundhyphenationmodecode", "strictstarthyphenationmodecode", "strictendhyphenationmodecode", "automaticpenaltyhyphenationmodecode", "explicitpenaltyhyphenationmodecode", "permitgluehyphenationmodecode", "permitallhyphenationmodecode", "permitmathreplacehyphenationmodecode", "normalizelinecode", "parindentskipcode", "swaphangindentcode", "swapparsshapecode", "breakafterdircode", "removemarginkernscode", "noligaturingcode", "nokerningcode", "noleftligaturecode", "noleftkerncode", "norightligaturecode", "norightkerncode", "noexpansioncode", "noprotrusioncode", "frozenflagcode", "tolerantflagcode", "protectedflagcode", "primitiveflagcode", "permanentflagcode", "noalignedflagcode", "immutableflagcode", "mutableflagcode", "globalflagcode", "overloadedflagcode", "immediateflagcode", "conditionalflagcode", "valueflagcode", "instanceflagcode", "continuewhenlmtxmode" },
- ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "nofarguments", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "vpenalty", "hpenalty", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "thebox", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "scratchmacro", "scratchmacroone", "scratchmacrotwo", "scratchconditiontrue", "scratchconditionfalse", "ifscratchcondition", "scratchconditiononetrue", "scratchconditiononefalse", "ifscratchconditionone", "scratchconditiontwotrue", "scratchconditiontwofalse", "ifscratchconditiontwo", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "aliasmacro", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeytabs", "obeypages", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "naturalspace", "controlspace", "normalspaces", "ignoretabs", "ignorelines", "ignorepages", "ignoreeofs", "setcontrolspaces", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "doloopovermatch", "doloopovermatched", "doloopoverlist", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "setconditional", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "ctxluamatch", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "freezeparagraphproperties", "defrostparagraphproperties", "setparagraphfreezing", "forgetparagraphfreezing", "updateparagraphproperties", "updateparagraphpenalties", "updateparagraphdemerits", "updateparagraphshapes", "updateparagraphlines", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "Umathtopaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "compounddiscretionary", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs", "openout", "closeout", "write", "openin", "closein", "read", "readline", "readfromterminal", "boxlines", "boxline", "setboxline", "copyboxline", "boxlinewd", "boxlineht", "boxlinedp", "boxlinenw", "boxlinenh", "boxlinend", "boxlinels", "boxliners", "boxlinelh", "boxlinerh", "boxlinelp", "boxlinerp", "boxlinein", "boxrangewd", "boxrangeht", "boxrangedp", "bitwiseset", "bitwiseand", "bitwiseor", "bitwisexor", "bitwisenot", "bitwisenil", "ifbitwiseand", "bitwise", "bitwiseshift", "bitwiseflip", "textdir", "linedir", "pardir", "boxdir", "prelistbox", "postlistbox", "prelistcopy", "postlistcopy", "setprelistbox", "setpostlistbox", "noligaturing", "nokerning", "noexpansion", "noprotrusion", "futureletnexttoken", "defbackslashbreak", "letbackslashbreak", "pushoverloadmode", "popoverloadmode" },
+ ["constants"]={ "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive", "plussix", "plusseven", "pluseight", "plusnine", "plusten", "pluseleven", "plustwelve", "plussixteen", "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred", "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint", "points", "halfpoint", "zeroskip", "zeromuskip", "onemuskip", "pluscxxvii", "pluscxxviii", "pluscclv", "pluscclvi", "normalpagebox", "directionlefttoright", "directionrighttoleft", "endoflinetoken", "outputnewlinechar", "emptytoks", "empty", "undefined", "voidbox", "emptybox", "emptyvbox", "emptyhbox", "bigskipamount", "medskipamount", "smallskipamount", "fmtname", "fmtversion", "texengine", "texenginename", "texengineversion", "texenginefunctionality", "luatexengine", "pdftexengine", "xetexengine", "unknownengine", "contextformat", "contextversion", "contextlmtxmode", "contextmark", "mksuffix", "activecatcode", "bgroup", "egroup", "endline", "conditionaltrue", "conditionalfalse", "attributeunsetvalue", "uprotationangle", "rightrotationangle", "downrotationangle", "leftrotationangle", "inicatcodes", "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes", "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes", "xmlcatcodes", "ctdcatcodes", "rlncatcodes", "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode", "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode", "spacecatcode", "lettercatcode", "othercatcode", "activecatcode", "commentcatcode", "invalidcatcode", "tabasciicode", "newlineasciicode", "formfeedasciicode", "endoflineasciicode", "endoffileasciicode", "commaasciicode", "spaceasciicode", "periodasciicode", "hashasciicode", "dollarasciicode", "commentasciicode", "ampersandasciicode", "colonasciicode", "backslashasciicode", "circumflexasciicode", "underscoreasciicode", "leftbraceasciicode", "barasciicode", "rightbraceasciicode", "tildeasciicode", "delasciicode", "leftparentasciicode", "rightparentasciicode", "lessthanasciicode", "morethanasciicode", "doublecommentsignal", "atsignasciicode", "exclamationmarkasciicode", "questionmarkasciicode", "doublequoteasciicode", "singlequoteasciicode", "forwardslashasciicode", "primeasciicode", "hyphenasciicode", "percentasciicode", "leftbracketasciicode", "rightbracketasciicode", "frozenhsizecode", "frozenskipcode", "frozenhangcode", "frozenindentcode", "frozenparfillcode", "frozenadjustcode", "frozenprotrudecode", "frozentolerancecode", "frozenstretchcode", "frozenloosenesscode", "frozenlastlinecode", "frozenlinepenaltycode", "frozenclubpenaltycode", "frozenwidowpenaltycode", "frozendisplaypenaltycode", "frozenbrokenpenaltycode", "frozendemeritscode", "frozenshapecode", "frozenlinecode", "frozenallcode", "activemathcharcode", "activetabtoken", "activeformfeedtoken", "activeendoflinetoken", "batchmodecode", "nonstopmodecode", "scrollmodecode", "errorstopmodecode", "bottomlevelgroupcode", "simplegroupcode", "hboxgroupcode", "adjustedhboxgroupcode", "vboxgroupcode", "vtopgroupcode", "aligngroupcode", "noaligngroupcode", "outputgroupcode", "mathgroupcode", "discretionarygroupcode", "insertgroupcode", "vadjustgroupcode", "vcentergroupcode", "mathabovegroupcode", "mathchoicegroupcode", "semisimplegroupcode", "mathshiftgroupcode", "mathleftgroupcode", "localboxgroupcode", "splitoffgroupcode", "splitkeepgroupcode", "preamblegroupcode", "alignsetgroupcode", "finrowgroupcode", "discretionarygroupcode", "charnodecode", "hlistnodecode", "vlistnodecode", "rulenodecode", "insertnodecode", "marknodecode", "adjustnodecode", "ligaturenodecode", "discretionarynodecode", "whatsitnodecode", "mathnodecode", "gluenodecode", "kernnodecode", "penaltynodecode", "unsetnodecode", "mathsnodecode", "charifcode", "catifcode", "numifcode", "dimifcode", "oddifcode", "vmodeifcode", "hmodeifcode", "mmodeifcode", "innerifcode", "voidifcode", "hboxifcode", "vboxifcode", "xifcode", "eofifcode", "trueifcode", "falseifcode", "caseifcode", "definedifcode", "csnameifcode", "fontcharifcode", "fontslantperpoint", "fontinterwordspace", "fontinterwordstretch", "fontinterwordshrink", "fontexheight", "fontemwidth", "fontextraspace", "slantperpoint", "mathexheight", "mathemwidth", "interwordspace", "interwordstretch", "interwordshrink", "exheight", "emwidth", "extraspace", "mathaxisheight", "muquad", "startmode", "stopmode", "startnotmode", "stopnotmode", "startmodeset", "stopmodeset", "doifmode", "doifelsemode", "doifmodeelse", "doifnotmode", "startmodeset", "stopmodeset", "startallmodes", "stopallmodes", "startnotallmodes", "stopnotallmodes", "doifallmodes", "doifelseallmodes", "doifallmodeselse", "doifnotallmodes", "startenvironment", "stopenvironment", "environment", "startcomponent", "stopcomponent", "component", "startproduct", "stopproduct", "product", "startproject", "stopproject", "project", "starttext", "stoptext", "startnotext", "stopnotext", "startdocument", "stopdocument", "documentvariable", "unexpandeddocumentvariable", "setupdocument", "presetdocument", "doifelsedocumentvariable", "doifdocumentvariableelse", "doifdocumentvariable", "doifnotdocumentvariable", "startmodule", "stopmodule", "usemodule", "usetexmodule", "useluamodule", "setupmodule", "currentmoduleparameter", "moduleparameter", "everystarttext", "everystoptext", "startTEXpage", "stopTEXpage", "enablemode", "disablemode", "preventmode", "definemode", "globalenablemode", "globaldisablemode", "globalpreventmode", "pushmode", "popmode", "typescriptone", "typescripttwo", "typescriptthree", "mathsizesuffix", "mathordcode", "mathopcode", "mathbincode", "mathrelcode", "mathopencode", "mathclosecode", "mathpunctcode", "mathalphacode", "mathinnercode", "mathnothingcode", "mathlimopcode", "mathnolopcode", "mathboxcode", "mathchoicecode", "mathaccentcode", "mathradicalcode", "constantnumber", "constantnumberargument", "constantdimen", "constantdimenargument", "constantemptyargument", "continueifinputfile", "luastringsep", "!!bs", "!!es", "lefttorightmark", "righttoleftmark", "lrm", "rlm", "bidilre", "bidirle", "bidipop", "bidilro", "bidirlo", "breakablethinspace", "nobreakspace", "nonbreakablespace", "narrownobreakspace", "zerowidthnobreakspace", "ideographicspace", "ideographichalffillspace", "twoperemspace", "threeperemspace", "fourperemspace", "fiveperemspace", "sixperemspace", "figurespace", "punctuationspace", "hairspace", "enquad", "emquad", "zerowidthspace", "zerowidthnonjoiner", "zerowidthjoiner", "zwnj", "zwj", "optionalspace", "asciispacechar", "softhyphen", "Ux", "eUx", "Umathaccents", "parfillleftskip", "parfillrightskip", "startlmtxmode", "stoplmtxmode", "startmkivmode", "stopmkivmode", "wildcardsymbol", "normalhyphenationmodecode", "automatichyphenationmodecode", "explicithyphenationmodecode", "syllablehyphenationmodecode", "uppercasehyphenationmodecode", "completehyphenationmodecode", "compoundhyphenationmodecode", "strictstarthyphenationmodecode", "strictendhyphenationmodecode", "automaticpenaltyhyphenationmodecode", "explicitpenaltyhyphenationmodecode", "permitgluehyphenationmodecode", "permitallhyphenationmodecode", "permitmathreplacehyphenationmodecode", "normalizelinecode", "parindentskipcode", "swaphangindentcode", "swapparsshapecode", "breakafterdircode", "removemarginkernscode", "noligaturingcode", "nokerningcode", "noleftligaturecode", "noleftkerncode", "norightligaturecode", "norightkerncode", "noexpansioncode", "noprotrusioncode", "frozenflagcode", "tolerantflagcode", "protectedflagcode", "primitiveflagcode", "permanentflagcode", "noalignedflagcode", "immutableflagcode", "mutableflagcode", "globalflagcode", "overloadedflagcode", "immediateflagcode", "conditionalflagcode", "valueflagcode", "instanceflagcode", "continuewhenlmtxmode" },
+ ["helpers"]={ "startsetups", "stopsetups", "startxmlsetups", "stopxmlsetups", "startluasetups", "stopluasetups", "starttexsetups", "stoptexsetups", "startrawsetups", "stoprawsetups", "startlocalsetups", "stoplocalsetups", "starttexdefinition", "stoptexdefinition", "starttexcode", "stoptexcode", "startcontextcode", "stopcontextcode", "startcontextdefinitioncode", "stopcontextdefinitioncode", "texdefinition", "doifelsesetups", "doifsetupselse", "doifsetups", "doifnotsetups", "setup", "setups", "texsetup", "xmlsetup", "luasetup", "directsetup", "fastsetup", "copysetups", "resetsetups", "doifelsecommandhandler", "doifcommandhandlerelse", "doifnotcommandhandler", "doifcommandhandler", "newmode", "setmode", "resetmode", "newsystemmode", "setsystemmode", "resetsystemmode", "pushsystemmode", "popsystemmode", "globalsetmode", "globalresetmode", "globalsetsystemmode", "globalresetsystemmode", "booleanmodevalue", "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif", "newlanguage", "newfamily", "newfam", "newhelp", "then", "begcsname", "autorule", "strippedcsname", "checkedstrippedcsname", "nofarguments", "firstargumentfalse", "firstargumenttrue", "secondargumentfalse", "secondargumenttrue", "thirdargumentfalse", "thirdargumenttrue", "fourthargumentfalse", "fourthargumenttrue", "fifthargumentfalse", "fifthargumenttrue", "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", "vkern", "hkern", "vpenalty", "hpenalty", "doglobal", "dodoglobal", "redoglobal", "resetglobal", "donothing", "dontcomplain", "forgetall", "donetrue", "donefalse", "foundtrue", "foundfalse", "inlineordisplaymath", "indisplaymath", "forcedisplaymath", "startforceddisplaymath", "stopforceddisplaymath", "startpickupmath", "stoppickupmath", "reqno", "mathortext", "thebox", "htdp", "unvoidbox", "hfilll", "vfilll", "mathbox", "mathlimop", "mathnolop", "mathnothing", "mathalpha", "currentcatcodetable", "defaultcatcodetable", "catcodetablename", "newcatcodetable", "startcatcodetable", "stopcatcodetable", "startextendcatcodetable", "stopextendcatcodetable", "pushcatcodetable", "popcatcodetable", "restorecatcodes", "setcatcodetable", "letcatcodecommand", "defcatcodecommand", "uedcatcodecommand", "hglue", "vglue", "hfillneg", "vfillneg", "hfilllneg", "vfilllneg", "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg", "normalhfilllneg", "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg", "normalvfilllneg", "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox", "ruledhpack", "ruledvpack", "ruledtpack", "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern", "ruledhglue", "ruledvglue", "normalhglue", "normalvglue", "ruledpenalty", "filledhboxb", "filledhboxr", "filledhboxg", "filledhboxc", "filledhboxm", "filledhboxy", "filledhboxk", "scratchcounter", "globalscratchcounter", "privatescratchcounter", "scratchdimen", "globalscratchdimen", "privatescratchdimen", "scratchskip", "globalscratchskip", "privatescratchskip", "scratchmuskip", "globalscratchmuskip", "privatescratchmuskip", "scratchtoks", "globalscratchtoks", "privatescratchtoks", "scratchbox", "globalscratchbox", "privatescratchbox", "scratchmacro", "scratchmacroone", "scratchmacrotwo", "scratchconditiontrue", "scratchconditionfalse", "ifscratchcondition", "scratchconditiononetrue", "scratchconditiononefalse", "ifscratchconditionone", "scratchconditiontwotrue", "scratchconditiontwofalse", "ifscratchconditiontwo", "globalscratchcounterone", "globalscratchcountertwo", "globalscratchcounterthree", "groupedcommand", "groupedcommandcs", "triggergroupedcommand", "triggergroupedcommandcs", "simplegroupedcommand", "pickupgroupedcommand", "usedbaselineskip", "usedlineskip", "usedlineskiplimit", "availablehsize", "localhsize", "setlocalhsize", "distributedhsize", "hsizefraction", "next", "nexttoken", "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", "boxisempty", "givenwidth", "givenheight", "givendepth", "scangivendimensions", "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", "scratchtopoffset", "scratchbottomoffset", "scratchleftoffset", "scratchrightoffset", "scratchcounterone", "scratchcountertwo", "scratchcounterthree", "scratchcounterfour", "scratchcounterfive", "scratchcountersix", "scratchdimenone", "scratchdimentwo", "scratchdimenthree", "scratchdimenfour", "scratchdimenfive", "scratchdimensix", "scratchskipone", "scratchskiptwo", "scratchskipthree", "scratchskipfour", "scratchskipfive", "scratchskipsix", "scratchmuskipone", "scratchmuskiptwo", "scratchmuskipthree", "scratchmuskipfour", "scratchmuskipfive", "scratchmuskipsix", "scratchtoksone", "scratchtokstwo", "scratchtoksthree", "scratchtoksfour", "scratchtoksfive", "scratchtokssix", "scratchboxone", "scratchboxtwo", "scratchboxthree", "scratchboxfour", "scratchboxfive", "scratchboxsix", "scratchnx", "scratchny", "scratchmx", "scratchmy", "scratchunicode", "scratchmin", "scratchmax", "scratchleftskip", "scratchrightskip", "scratchtopskip", "scratchbottomskip", "doif", "doifnot", "doifelse", "firstinset", "doifinset", "doifnotinset", "doifelseinset", "doifinsetelse", "doifelsenextchar", "doifnextcharelse", "doifelsenextcharcs", "doifnextcharcselse", "doifelsenextoptional", "doifnextoptionalelse", "doifelsenextoptionalcs", "doifnextoptionalcselse", "doifelsefastoptionalcheck", "doiffastoptionalcheckelse", "doifelsefastoptionalcheckcs", "doiffastoptionalcheckcselse", "doifelsenextbgroup", "doifnextbgroupelse", "doifelsenextbgroupcs", "doifnextbgroupcselse", "doifelsenextparenthesis", "doifnextparenthesiselse", "doifelseundefined", "doifundefinedelse", "doifelsedefined", "doifdefinedelse", "doifundefined", "doifdefined", "doifelsevalue", "doifvalue", "doifnotvalue", "doifnothing", "doifsomething", "doifelsenothing", "doifnothingelse", "doifelsesomething", "doifsomethingelse", "doifvaluenothing", "doifvaluesomething", "doifelsevaluenothing", "doifvaluenothingelse", "doifelsedimension", "doifdimensionelse", "doifelsenumber", "doifnumberelse", "doifnumber", "doifnotnumber", "doifelsecommon", "doifcommonelse", "doifcommon", "doifnotcommon", "doifinstring", "doifnotinstring", "doifelseinstring", "doifinstringelse", "doifelseassignment", "doifassignmentelse", "docheckassignment", "doifelseassignmentcs", "doifassignmentelsecs", "validassignment", "novalidassignment", "doiftext", "doifelsetext", "doiftextelse", "doifnottext", "quitcondition", "truecondition", "falsecondition", "tracingall", "tracingnone", "loggingall", "showluatokens", "aliasmacro", "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to", "endgraf", "endpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf", "obeyspaces", "obeylines", "obeytabs", "obeypages", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage", "normalspace", "naturalspace", "controlspace", "normalspaces", "ignoretabs", "ignorelines", "ignorepages", "ignoreeofs", "setcontrolspaces", "executeifdefined", "singleexpandafter", "doubleexpandafter", "tripleexpandafter", "dontleavehmode", "removelastspace", "removeunwantedspaces", "keepunwantedspaces", "removepunctuation", "ignoreparskip", "forcestrutdepth", "onlynonbreakablespace", "wait", "writestatus", "define", "defineexpandable", "redefine", "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", "directmeasure", "setquantity", "setequantity", "setgquantity", "setxquantity", "definequantity", "freezequantity", "quantity", "quantitied", "directquantity", "installcorenamespace", "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue", "resetvalue", "undefinevalue", "ignorevalue", "setuvalue", "setuevalue", "setugvalue", "setuxvalue", "globallet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique", "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters", "getdummyparameters", "dummyparameter", "directdummyparameter", "setdummyparameter", "letdummyparameter", "setexpandeddummyparameter", "usedummystyleandcolor", "usedummystyleparameter", "usedummycolorparameter", "processcommalist", "processcommacommand", "quitcommalist", "quitprevcommalist", "processaction", "processallactions", "processfirstactioninset", "processallactionsinset", "unexpanded", "expanded", "startexpanded", "stopexpanded", "protect", "unprotect", "firstofoneargument", "firstoftwoarguments", "secondoftwoarguments", "firstofthreearguments", "secondofthreearguments", "thirdofthreearguments", "firstoffourarguments", "secondoffourarguments", "thirdoffourarguments", "fourthoffourarguments", "firstoffivearguments", "secondoffivearguments", "thirdoffivearguments", "fourthoffivearguments", "fifthoffivearguments", "firstofsixarguments", "secondofsixarguments", "thirdofsixarguments", "fourthofsixarguments", "fifthofsixarguments", "sixthofsixarguments", "firstofoneunexpanded", "firstoftwounexpanded", "secondoftwounexpanded", "firstofthreeunexpanded", "secondofthreeunexpanded", "thirdofthreeunexpanded", "gobbleoneargument", "gobbletwoarguments", "gobblethreearguments", "gobblefourarguments", "gobblefivearguments", "gobblesixarguments", "gobblesevenarguments", "gobbleeightarguments", "gobbleninearguments", "gobbletenarguments", "gobbleoneoptional", "gobbletwooptionals", "gobblethreeoptionals", "gobblefouroptionals", "gobblefiveoptionals", "dorecurse", "doloop", "exitloop", "dostepwiserecurse", "recurselevel", "recursedepth", "dofastloopcs", "fastloopindex", "fastloopfinal", "dowith", "doloopovermatch", "doloopovermatched", "doloopoverlist", "newconstant", "setnewconstant", "setconstant", "setconstantvalue", "newconditional", "settrue", "setfalse", "settruevalue", "setfalsevalue", "setconditional", "newmacro", "setnewmacro", "newfraction", "newsignal", "dosingleempty", "dodoubleempty", "dotripleempty", "doquadrupleempty", "doquintupleempty", "dosixtupleempty", "doseventupleempty", "dosingleargument", "dodoubleargument", "dotripleargument", "doquadrupleargument", "doquintupleargument", "dosixtupleargument", "doseventupleargument", "dosinglegroupempty", "dodoublegroupempty", "dotriplegroupempty", "doquadruplegroupempty", "doquintuplegroupempty", "permitspacesbetweengroups", "dontpermitspacesbetweengroups", "nopdfcompression", "maximumpdfcompression", "normalpdfcompression", "onlypdfobjectcompression", "nopdfobjectcompression", "modulonumber", "dividenumber", "getfirstcharacter", "doifelsefirstchar", "doiffirstcharelse", "startnointerference", "stopnointerference", "twodigits", "threedigits", "leftorright", "offinterlineskip", "oninterlineskip", "nointerlineskip", "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", "opordspacing", "opopspacing", "opbinspacing", "oprelspacing", "opopenspacing", "opclosespacing", "oppunctspacing", "opinnerspacing", "binordspacing", "binopspacing", "binbinspacing", "binrelspacing", "binopenspacing", "binclosespacing", "binpunctspacing", "bininnerspacing", "relordspacing", "relopspacing", "relbinspacing", "relrelspacing", "relopenspacing", "relclosespacing", "relpunctspacing", "relinnerspacing", "openordspacing", "openopspacing", "openbinspacing", "openrelspacing", "openopenspacing", "openclosespacing", "openpunctspacing", "openinnerspacing", "closeordspacing", "closeopspacing", "closebinspacing", "closerelspacing", "closeopenspacing", "closeclosespacing", "closepunctspacing", "closeinnerspacing", "punctordspacing", "punctopspacing", "punctbinspacing", "punctrelspacing", "punctopenspacing", "punctclosespacing", "punctpunctspacing", "punctinnerspacing", "innerordspacing", "inneropspacing", "innerbinspacing", "innerrelspacing", "inneropenspacing", "innerclosespacing", "innerpunctspacing", "innerinnerspacing", "normalreqno", "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", "normalsuperscript", "normalsubscript", "normalnosuperscript", "normalnosubscript", "superscript", "subscript", "nosuperscript", "nosubscript", "superprescript", "subprescript", "nosuperprescript", "nosubsprecript", "uncramped", "cramped", "mathstyletrigger", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", "mathtext", "setmathsmalltextbox", "setmathtextbox", "pushmathstyle", "popmathstyle", "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle", "triggeruncrampedstyle", "triggercrampedstyle", "triggersmallstyle", "triggeruncrampedsmallstyle", "triggercrampedsmallstyle", "triggerbigstyle", "triggeruncrampedbigstyle", "triggercrampedbigstyle", "luaexpr", "expelsedoif", "expdoif", "expdoifnot", "expdoifelsecommon", "expdoifcommonelse", "expdoifelseinset", "expdoifinsetelse", "ctxdirectlua", "ctxlatelua", "ctxsprint", "ctxwrite", "ctxcommand", "ctxdirectcommand", "ctxlatecommand", "ctxreport", "ctxlua", "luacode", "lateluacode", "directluacode", "registerctxluafile", "ctxloadluafile", "luaversion", "luamajorversion", "luaminorversion", "ctxluacode", "luaconditional", "luaexpanded", "ctxluamatch", "startluaparameterset", "stopluaparameterset", "luaparameterset", "definenamedlua", "obeylualines", "obeyluatokens", "startluacode", "stopluacode", "startlua", "stoplua", "startctxfunction", "stopctxfunction", "ctxfunction", "startctxfunctiondefinition", "stopctxfunctiondefinition", "installctxfunction", "installprotectedctxfunction", "installprotectedctxscanner", "installctxscanner", "resetctxscanner", "cldprocessfile", "cldloadfile", "cldloadviafile", "cldcontext", "cldcommand", "carryoverpar", "freezeparagraphproperties", "defrostparagraphproperties", "setparagraphfreezing", "forgetparagraphfreezing", "updateparagraphproperties", "updateparagraphpenalties", "updateparagraphdemerits", "updateparagraphshapes", "updateparagraphlines", "lastlinewidth", "assumelongusagecs", "Umathbotaccent", "Umathtopaccent", "righttolefthbox", "lefttorighthbox", "righttoleftvbox", "lefttorightvbox", "righttoleftvtop", "lefttorightvtop", "rtlhbox", "ltrhbox", "rtlvbox", "ltrvbox", "rtlvtop", "ltrvtop", "autodirhbox", "autodirvbox", "autodirvtop", "leftorrighthbox", "leftorrightvbox", "leftorrightvtop", "lefttoright", "righttoleft", "checkedlefttoright", "checkedrighttoleft", "synchronizelayoutdirection", "synchronizedisplaydirection", "synchronizeinlinedirection", "dirlre", "dirrle", "dirlro", "dirrlo", "lesshyphens", "morehyphens", "nohyphens", "dohyphens", "compounddiscretionary", "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath", "break", "nobreak", "allowbreak", "goodbreak", "nospace", "nospacing", "dospacing", "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack", "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack", "frule", "compoundhyphenpenalty", "start", "stop", "unsupportedcs", "openout", "closeout", "write", "openin", "closein", "read", "readline", "readfromterminal", "boxlines", "boxline", "setboxline", "copyboxline", "boxlinewd", "boxlineht", "boxlinedp", "boxlinenw", "boxlinenh", "boxlinend", "boxlinels", "boxliners", "boxlinelh", "boxlinerh", "boxlinelp", "boxlinerp", "boxlinein", "boxrangewd", "boxrangeht", "boxrangedp", "bitwiseset", "bitwiseand", "bitwiseor", "bitwisexor", "bitwisenot", "bitwisenil", "ifbitwiseand", "bitwise", "bitwiseshift", "bitwiseflip", "textdir", "linedir", "pardir", "boxdir", "prelistbox", "postlistbox", "prelistcopy", "postlistcopy", "setprelistbox", "setpostlistbox", "noligaturing", "nokerning", "noexpansion", "noprotrusion", "futureletnexttoken", "defbackslashbreak", "letbackslashbreak", "pushoverloadmode", "popoverloadmode" },
 }
\ No newline at end of file
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 a9ede54c3..46300f356 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", "withopacity", "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", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
+ ["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", "shownshadedirection", "shownshadecenter", "cmyk", "spotcolor", "multitonecolor", "namedcolor", "drawfill", "undrawfill", "inverted", "uncolored", "softened", "grayed", "greyed", "onlayer", "along", "graphictext", "loadfigure", "externalfigure", "figure", "register", "outlinetext", "filloutlinetext", "drawoutlinetext", "outlinetexttopath", "checkedbounds", "checkbounds", "strut", "rule", "withmask", "bitmapimage", "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist", "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext", "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext", "notcached", "keepcached", "verbatim", "thelabel", "label", "autoalign", "transparent", "withtransparency", "withopacity", "property", "properties", "withproperties", "asgroup", "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", "lualist", "mp", "MP", "luacall", "mirrored", "mirroredabout", "scriptindex", "newscriptindex" },
+ ["internals"]={ "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel", "shadefactor", "shadeoffset", "textextoffset", "textextanchor", "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent", "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent", "darkentransparent", "lightentransparent", "differencetransparent", "exclusiontransparent", "huetransparent", "saturationtransparent", "colortransparent", "luminositytransparent", "ahvariant", "ahdimple", "ahfactor", "ahscale", "metapostversion", "maxdimensions", "drawoptionsfactor", "dq", "sq", "crossingscale", "crossingoption", "contextlmtxmode", "metafunversion", "getparameters", "presetparameters", "hasparameter", "hasoption", "getparameter", "getparameterdefault", "getparametercount", "getmaxparametercount", "getparameterpath", "getparameterpen", "getparametertext", "applyparameters", "pushparameters", "popparameters", "definecolor" },
 }
\ No newline at end of file
diff --git a/context/data/textadept/context/data/scite-context-data-metapost.lua b/context/data/textadept/context/data/scite-context-data-metapost.lua
index 39ab6bde0..1c67ad1cf 100644
--- a/context/data/textadept/context/data/scite-context-data-metapost.lua
+++ b/context/data/textadept/context/data/scite-context-data-metapost.lua
@@ -1,9 +1,9 @@
 return {
- ["commands"]={ "upto", "downto", "beginfig", "endfig", "beginglyph", "endglyph", "rotatedaround", "reflectedabout", "arrowhead", "currentpen", "currentpicture", "cuttings", "defaultfont", "extra_beginfig", "extra_endfig", "down", "evenly", "fullcircle", "halfcircle", "identity", "in", "left", "pensquare", "penrazor", "penspec", "origin", "quartercircle", "right", "unitsquare", "up", "withdots", "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir", "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "round", "unitvector", "whatever", "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot", "loggingall", "interact", "tracingall", "tracingnone", "pickup", "undraw", "unfill", "unfilldraw", "buildcycle", "dashpattern", "decr", "dotlabel", "dotlabels", "drawoptions", "incr", "label", "labels", "max", "min", "thelabel", "z", "beginchar", "blacker", "capsule_end", "change_width", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "endchar", "extra_beginchar", "extra_endchar", "extra_setup", "font_coding_scheme", "clearxy", "clearit", "clearpen", "shipit", "font_extra_space", "exitunless", "relax", "hide", "gobble", "gobbled", "stop", "blankpicture", "counterclockwise", "tensepath", "takepower", "direction", "softjoin", "makelabel", "rotatedabout", "flex", "superellipse", "image", "nullpen", "savepen", "clearpen", "penpos", "penlabels", "range", "thru", "z", "laboff", "bye", "red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background", "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in", "triplet", "quadruplet", "totransform", "bymatrix" },
+ ["commands"]={ "on", "off", "interpath", "upto", "downto", "beginfig", "endfig", "beginglyph", "endglyph", "beginfont", "endfont", "rotatedaround", "reflectedabout", "arrowhead", "currentpen", "currentpicture", "cuttings", "defaultfont", "extra_beginfig", "extra_endfig", "down", "evenly", "fullcircle", "halfcircle", "identity", "in", "left", "pensquare", "penrazor", "penspec", "origin", "quartercircle", "right", "unitsquare", "up", "withdots", "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir", "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "round", "unitvector", "whatever", "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot", "loggingall", "interact", "tracingall", "tracingnone", "pickup", "undraw", "unfill", "unfilldraw", "buildcycle", "dashpattern", "decr", "dotlabel", "dotlabels", "drawoptions", "incr", "label", "labels", "max", "min", "thelabel", "z", "beginchar", "blacker", "capsule_end", "change_width", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "endchar", "extra_beginchar", "extra_endchar", "extra_setup", "font_coding_scheme", "clearxy", "clearit", "clearpen", "shipit", "font_extra_space", "exitunless", "relax", "hide", "gobble", "gobbled", "stop", "blankpicture", "counterclockwise", "tensepath", "takepower", "direction", "softjoin", "makelabel", "rotatedabout", "flex", "superellipse", "image", "nullpen", "savepen", "clearpen", "penpos", "penlabels", "range", "thru", "z", "laboff", "bye", "red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background", "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in", "triplet", "quadruplet", "totransform", "bymatrix", "primitive", "permanent", "immutable", "mutable", "frozen" },
  ["disabled"]={ "verbatimtex", "troffmode" },
  ["internals"]={ "mitered", "rounded", "beveled", "butt", "squared", "eps", "epsilon", "infinity", "bboxmargin", "ahlength", "ahangle", "labeloffset", "dotlabeldiam", "defaultpen", "defaultscale", "join_radius", "charscale", "inicatcoderegime", "texcatcoderegime", "luacatcoderegime", "notcatcoderegime", "vrbcatcoderegime", "prtcatcoderegime", "ctxcatcoderegime", "txtcatcoderegime", "catcoderegime", "ditto", "EOF", "pen_lft", "pen_rt", "pen_top", "pen_bot" },
  ["metafont"]={ "autorounding", "beginchar", "blacker", "boundarychar", "capsule_def", "capsule_end", "change_width", "chardp", "chardx", "chardy", "charexists", "charext", "charht", "charic", "charlist", "charwd", "cull", "cullit", "currenttransform", "currentwindow", "define_blacker_pixels", "define_corrected_pixels", "define_good_x_pixels", "define_good_y_pixels", "define_horizontal_corrected_pixels", "define_pixels", "define_whole_blacker_pixels", "define_whole_pixels", "define_whole_vertical_blacker_pixels", "define_whole_vertical_pixels", "designsize", "display", "displaying", "endchar", "extensible", "extra_beginchar", "extra_endchar", "extra_setup", "fillin", "font_coding_scheme", "font_extra_space", "font_identifier", "font_normal_shrink", "font_normal_space", "font_normal_stretch", "font_quad", "font_size", "font_slant", "font_x_height", "fontdimen", "fontmaking", "gfcorners", "granularity", "grayfont", "headerbyte", "hppp", "hround", "imagerules", "italcorr", "kern", "labelfont", "ligtable", "lowres_fix", "makebox", "makegrid", "maketicks", "mode_def", "mode_setup", "nodisplays", "notransforms", "numspecial", "o_correction", "openit", "openwindow", "pixels_per_inch", "proofing", "proofoffset", "proofrule", "proofrulethickness", "rulepen", "screenchars", "screenrule", "screenstrokes", "screen_cols", "screen_rows", "showit", "slantfont", "smode", "smoothing", "titlefont", "totalweight", "tracingedges", "tracingpens", "turningcheck", "unitpixel", "vppp", "vround", "xoffset", "yoffset" },
- ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "void", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "setgroup", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "interpath", "on", "off", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "closefrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext", "numbersystem" },
+ ["primitives"]={ "charcode", "day", "linecap", "linejoin", "miterlimit", "month", "pausing", "prologues", "showstopping", "time", "tracingcapsules", "tracingchoices", "mpprocset", "tracingcommands", "tracingequations", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingrestores", "tracingspecs", "tracingstats", "tracingtitles", "truecorners", "warningcheck", "year", "false", "nullpicture", "pencircle", "penspec", "true", "and", "angle", "arclength", "arctime", "ASCII", "boolean", "bot", "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize", "hex", "infont", "intersectiontimes", "known", "void", "length", "llcorner", "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not", "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point", "postcontrol", "precontrol", "reverse", "rotated", "scaled", "shifted", "sind", "slanted", "sqrt", "str", "string", "subpath", "substring", "transform", "transformed", "ulcorner", "uniformdeviate", "unknown", "urcorner", "xpart", "xscaled", "xxpart", "xypart", "ypart", "yscaled", "yxpart", "yypart", "zscaled", "addto", "clip", "input", "interim", "let", "newinternal", "save", "setbounds", "setgroup", "shipout", "show", "showdependencies", "showtoken", "showvariable", "special", "begingroup", "endgroup", "of", "curl", "tension", "and", "controls", "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary", "tertiary", "primarydef", "secondarydef", "tertiarydef", "randomseed", "also", "contour", "doublepath", "withcolor", "withcmykcolor", "withpen", "dashed", "envelope", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif", "within", "forsuffixes", "step", "until", "charlist", "extensible", "fontdimen", "headerbyte", "kern", "ligtable", "boundarychar", "chardp", "charext", "charht", "charic", "charwd", "designsize", "fontmaking", "charexists", "cullit", "currenttransform", "gfcorners", "grayfont", "hround", "imagerules", "lowres_fix", "nodisplays", "notransforms", "openit", "displaying", "currentwindow", "screen_rows", "screen_cols", "pixels_per_inch", "cull", "display", "openwindow", "numspecial", "totalweight", "autorounding", "fillin", "proofing", "tracingpens", "xoffset", "chardx", "granularity", "smoothing", "turningcheck", "yoffset", "chardy", "hppp", "tracingedges", "vppp", "extra_beginfig", "extra_endfig", "mpxbreak", "endinput", "message", "delimiters", "turningnumber", "errmessage", "scantokens", "end", "outer", "inner", "write", "to", "readfrom", "closefrom", "withprescript", "withpostscript", "top", "bot", "lft", "rt", "ulft", "urt", "llft", "lrt", "redpart", "greenpart", "bluepart", "cyanpart", "magentapart", "yellowpart", "blackpart", "prescriptpart", "postscriptpart", "rgbcolor", "cmykcolor", "colormodel", "graypart", "greypart", "greycolor", "graycolor", "dashpart", "penpart", "stroked", "filled", "textual", "clipped", "bounded", "pathpart", "expandafter", "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline", "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode", "runscript", "maketext", "numbersystem", "overloadmode", "setproperty" },
  ["shortcuts"]={ "..", "...", "--", "---", "&", "\\" },
  ["tex"]={ "btex", "etex", "verbatimtex" },
 }
\ 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 9d121ea45..8aef95cfe 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|withopacity|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_@!?-ÿ])",
+   "match" : "(zmod|ystretched|ysized|xysized|xyscaled|xstretched|xsized|withtransparency|withshadevector|withshadetransform|withshadestep|withshaderadius|withshadeorigin|withshademethod|withshadefraction|withshadefactor|withshadedomain|withshadedirection|withshadecolors|withshadecenter|withshade|withproperties|withopacity|withmask|withlinearshade|withgrey|withgray|withcircularshade|whitecolor|wdpart|visualizepaths|visualizedfill|visualizeddraw|verbatim|validtexbox|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|thefmttext|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|shownshadedirection|shownshadecenter|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|rawmadetext|rawfmttext|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|onetimetextext|onetimefmttext|oddly|nothing|notcached|normalfill|normaldraw|nofill|nodraw|newscriptindex|newhash|naturalizepaths|namedcolor|multitonecolor|mp|mirroredabout|mirrored|lualist|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|fmttext|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" : {
@@ -115,11 +115,11 @@
    "name" : "context.number.number.mps"
   },
   "plain" : {
-   "match" : "(z|z|yellow|withdots|white|whatever|upto|up|unitvector|unitsquare|unfilldraw|unfill|undraw|triplet|tracingnone|tracingall|totransform|thru|thelabel|tensepath|takepower|superellipse|stop|softjoin|shipit|savepen|round|rotatedaround|rotatedabout|right|relax|reflectedabout|red|range|quartercircle|quadruplet|pt|pickup|pensquare|penspec|penrazor|penpos|penlabels|pc|origin|nullpen|mod|mm|min|max|makelabel|magenta|loggingall|left|laboff|labels|label|inverse|intersectionpoint|interact|incr|in|in|image|identity|hide|halfcircle|green|gobbled|gobble|fullcircle|font_extra_space|font_coding_scheme|flex|filldraw|fill|extra_setup|extra_endfig|extra_endchar|extra_beginfig|extra_beginchar|exitunless|evenly|endglyph|endfig|endchar|drawoptions|drawdot|drawdblarrow|drawarrow|draw|downto|down|dotprod|dotlabels|dotlabel|div|directionpoint|direction|dir|define_whole_vertical_pixels|define_whole_vertical_blacker_pixels|define_whole_pixels|define_whole_blacker_pixels|define_pixels|define_horizontal_corrected_pixels|define_good_y_pixels|define_good_x_pixels|define_corrected_pixels|define_blacker_pixels|defaultfont|decr|dd|dashpattern|cyan|cuttings|cutdraw|cutbefore|cutafter|currentpicture|currentpen|counterclockwise|cm|clearxy|clearpen|clearpen|clearit|change_width|center|ceiling|cc|capsule_end|bymatrix|bye|buildcycle|bp|blue|blankpicture|blacker|black|beginglyph|beginfig|beginchar|bbox|background|arrowhead|abs)(?=[^a-zA-Z\u005C_@!?-ÿ])",
+   "match" : "(z|z|yellow|withdots|white|whatever|upto|up|unitvector|unitsquare|unfilldraw|unfill|undraw|triplet|tracingnone|tracingall|totransform|thru|thelabel|tensepath|takepower|superellipse|stop|softjoin|shipit|savepen|round|rotatedaround|rotatedabout|right|relax|reflectedabout|red|range|quartercircle|quadruplet|pt|primitive|pickup|permanent|pensquare|penspec|penrazor|penpos|penlabels|pc|origin|on|off|nullpen|mutable|mod|mm|min|max|makelabel|magenta|loggingall|left|laboff|labels|label|inverse|intersectionpoint|interpath|interact|incr|in|in|immutable|image|identity|hide|halfcircle|green|gobbled|gobble|fullcircle|frozen|font_extra_space|font_coding_scheme|flex|filldraw|fill|extra_setup|extra_endfig|extra_endchar|extra_beginfig|extra_beginchar|exitunless|evenly|endglyph|endfont|endfig|endchar|drawoptions|drawdot|drawdblarrow|drawarrow|draw|downto|down|dotprod|dotlabels|dotlabel|div|directionpoint|direction|dir|define_whole_vertical_pixels|define_whole_vertical_blacker_pixels|define_whole_pixels|define_whole_blacker_pixels|define_pixels|define_horizontal_corrected_pixels|define_good_y_pixels|define_good_x_pixels|define_corrected_pixels|define_blacker_pixels|defaultfont|decr|dd|dashpattern|cyan|cuttings|cutdraw|cutbefore|cutafter|currentpicture|currentpen|counterclockwise|cm|clearxy|clearpen|clearpen|clearit|change_width|center|ceiling|cc|capsule_end|bymatrix|bye|buildcycle|bp|blue|blankpicture|blacker|black|beginglyph|beginfont|beginfig|beginchar|bbox|background|arrowhead|abs)(?=[^a-zA-Z\u005C_@!?-ÿ])",
    "name" : "context.plain.plain.mps"
   },
   "primitive" : {
-   "match" : "(zscaled|yypart|yxpart|yscaled|ypart|yoffset|yellowpart|year|xypart|xxpart|xscaled|xpart|xoffset|write|withprescript|withpostscript|withpen|within|withcolor|withcmykcolor|warningcheck|vppp|void|vardef|urt|urcorner|until|unknown|uniformdeviate|ulft|ulcorner|turningnumber|turningcheck|truecorners|true|troffmode|transformed|transform|tracingtitles|tracingstats|tracingspecs|tracingrestores|tracingpens|tracingoutput|tracingonline|tracingmacros|tracinglostchars|tracingequations|tracingedges|tracingcommands|tracingchoices|tracingcapsules|totalweight|top|to|time|textual|text|tertiarydef|tertiary|tension|suffix|substring|subpath|stroked|string|str|step|sqrt|special|smoothing|slanted|sind|showvariable|showtoken|showstopping|showdependencies|show|shipout|shifted|setgroup|setbounds|secondarydef|secondary|screen_rows|screen_cols|scantokens|scaled|save|runscript|rt|rotated|rgbcolor|reverse|restoreclipcolor|redpart|readfrom|randomseed|proofing|prologues|primarydef|primary|prescriptpart|precontrol|postscriptpart|postcontrol|point|pixels_per_inch|picture|penspec|penpart|penoffset|pencircle|pen|pausing|pathpart|path|pair|outputtemplate|outputformat|outer|or|openwindow|openit|on|off|of|odd|oct|numspecial|numeric|numbersystem|nullpicture|notransforms|not|normaldeviate|nodisplays|newinternal|mpxbreak|mpprocset|month|mlog|miterlimit|minute|mexp|message|maketext|makepen|makepath|magentapart|lrt|lrcorner|lowres_fix|llft|llcorner|linejoin|linecap|ligtable|lft|let|length|known|kern|intersectiontimes|interpath|interim|input|inner|infont|imagerules|if|hround|hppp|hour|hex|headerbyte|greypart|greycolor|greenpart|graypart|grayfont|graycolor|granularity|glyph|gfcorners|forsuffixes|forever|for|fontsize|fontsize|fontpart|fontmapline|fontmapfile|fontmaking|fontdimen|floor|fillin|filled|filenametemplate|fi|false|extra_endfig|extra_beginfig|extensible|expr|expandafter|exitif|errmessage|envelope|endinput|endgroup|endfor|enddef|end|elseif|else|doublepath|displaying|display|directiontime|designsize|delimiters|def|decimal|day|dashpart|dashed|cycle|cyanpart|currentwindow|currenttransform|curl|cullit|cull|cosd|controls|contour|colormodel|color|cmykcolor|closefrom|clipped|clip|charwd|charlist|charic|charht|charext|charexists|chardy|chardx|chardp|charcode|char|bounded|boundarychar|bot|bot|boolean|bluepart|blackpart|begingroup|autorounding|arctime|arclength|angle|and|and|also|addto|ASCII)(?=[^a-zA-Z\u005C_@!?-ÿ])",
+   "match" : "(zscaled|yypart|yxpart|yscaled|ypart|yoffset|yellowpart|year|xypart|xxpart|xscaled|xpart|xoffset|write|withprescript|withpostscript|withpen|within|withcolor|withcmykcolor|warningcheck|vppp|void|vardef|urt|urcorner|until|unknown|uniformdeviate|ulft|ulcorner|turningnumber|turningcheck|truecorners|true|troffmode|transformed|transform|tracingtitles|tracingstats|tracingspecs|tracingrestores|tracingpens|tracingoutput|tracingonline|tracingmacros|tracinglostchars|tracingequations|tracingedges|tracingcommands|tracingchoices|tracingcapsules|totalweight|top|to|time|textual|text|tertiarydef|tertiary|tension|suffix|substring|subpath|stroked|string|str|step|sqrt|special|smoothing|slanted|sind|showvariable|showtoken|showstopping|showdependencies|show|shipout|shifted|setproperty|setgroup|setbounds|secondarydef|secondary|screen_rows|screen_cols|scantokens|scaled|save|runscript|rt|rotated|rgbcolor|reverse|restoreclipcolor|redpart|readfrom|randomseed|proofing|prologues|primarydef|primary|prescriptpart|precontrol|postscriptpart|postcontrol|point|pixels_per_inch|picture|penspec|penpart|penoffset|pencircle|pen|pausing|pathpart|path|pair|overloadmode|outputtemplate|outputformat|outer|or|openwindow|openit|of|odd|oct|numspecial|numeric|numbersystem|nullpicture|notransforms|not|normaldeviate|nodisplays|newinternal|mpxbreak|mpprocset|month|mlog|miterlimit|minute|mexp|message|maketext|makepen|makepath|magentapart|lrt|lrcorner|lowres_fix|llft|llcorner|linejoin|linecap|ligtable|lft|let|length|known|kern|intersectiontimes|interim|input|inner|infont|imagerules|if|hround|hppp|hour|hex|headerbyte|greypart|greycolor|greenpart|graypart|grayfont|graycolor|granularity|glyph|gfcorners|forsuffixes|forever|for|fontsize|fontsize|fontpart|fontmapline|fontmapfile|fontmaking|fontdimen|floor|fillin|filled|filenametemplate|fi|false|extra_endfig|extra_beginfig|extensible|expr|expandafter|exitif|errmessage|envelope|endinput|endgroup|endfor|enddef|end|elseif|else|doublepath|displaying|display|directiontime|designsize|delimiters|def|decimal|day|dashpart|dashed|cycle|cyanpart|currentwindow|currenttransform|curl|cullit|cull|cosd|controls|contour|colormodel|color|cmykcolor|closefrom|clipped|clip|charwd|charlist|charic|charht|charext|charexists|chardy|chardx|chardp|charcode|char|bounded|boundarychar|bot|bot|boolean|bluepart|blackpart|begingroup|autorounding|arctime|arclength|angle|and|and|also|addto|ASCII)(?=[^a-zA-Z\u005C_@!?-ÿ])",
    "name" : "context.primitive.primitive.mps"
   },
   "quoted" : {
@@ -138,7 +138,7 @@
    "name" : "context.string.string.text.mps"
   },
   "shortcut" : {
-   "match" : "(vrbcatcoderegime|txtcatcoderegime|textextoffset|textextanchor|texcatcoderegime|squared|sq|softlighttransparent|shadefactor|screentransparent|saturationtransparent|rounded|rgbcolormodel|pushparameters|prtcatcoderegime|presetparameters|popparameters|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|notcatcoderegime|normaltransparent|nocolormodel|multiplytransparent|mitered|metapostversion|maxdimensions|luminositytransparent|luacatcoderegime|lightentransparent|labeloffset|join_radius|inicatcoderegime|infinity|huetransparent|hasparameter|hasoption|hardlighttransparent|greycolormodel|graycolormodel|getparametertext|getparameters|getparameterpen|getparameterpath|getparameterdefault|getparametercount|getparameter|getmaxparametercount|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|definecolor|defaultscale|defaultpen|darkentransparent|ctxcatcoderegime|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|catcoderegime|butt|beveled|bboxmargin|applyparameters|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
+   "match" : "(vrbcatcoderegime|txtcatcoderegime|textextoffset|textextanchor|texcatcoderegime|squared|sq|softlighttransparent|shadeoffset|shadefactor|screentransparent|saturationtransparent|rounded|rgbcolormodel|pushparameters|prtcatcoderegime|presetparameters|popparameters|pen_top|pen_rt|pen_lft|pen_bot|overlaytransparent|notcatcoderegime|normaltransparent|nocolormodel|multiplytransparent|mitered|metapostversion|metafunversion|maxdimensions|luminositytransparent|luacatcoderegime|lightentransparent|labeloffset|join_radius|inicatcoderegime|infinity|huetransparent|hasparameter|hasoption|hardlighttransparent|greycolormodel|graycolormodel|getparametertext|getparameters|getparameterpen|getparameterpath|getparameterdefault|getparametercount|getparameter|getmaxparametercount|exclusiontransparent|epsilon|eps|drawoptionsfactor|dq|dotlabeldiam|ditto|differencetransparent|definecolor|defaultscale|defaultpen|darkentransparent|ctxcatcoderegime|crossingscale|crossingoption|contextlmtxmode|colortransparent|colordodgetransparent|colorburntransparent|cmykcolormodel|charscale|catcoderegime|butt|beveled|bboxmargin|applyparameters|ahvariant|ahscale|ahlength|ahfactor|ahdimple|ahangle|EOF)(?=[^a-zA-Z\u005C_@!?-ÿ])",
    "name" : "context.data.shortcut.mps"
   },
   "special" : {
diff --git a/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json b/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
index 530d57fe1..f51568c87 100644
--- a/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
+++ b/context/data/vscode/extensions/context/syntaxes/context-syntax-tex.json
@@ -68,7 +68,7 @@
    "name" : "context.comment.comment.tex"
   },
   "constant" : {
-   "match" : "\u005C\u005C(zwnj|zwj|zerowidthspace|zerowidthnonjoiner|zerowidthnobreakspace|zerowidthjoiner|zeroskip|zeropoint|zeromuskip|zerocount|xmlcatcodes|xifcode|xetexengine|wildcardsymbol|whatsitnodecode|vtopgroupcode|vrbcatcodes|voidifcode|voidbox|vmodeifcode|vlistnodecode|vcentergroupcode|vboxifcode|vboxgroupcode|valueflagcode|vadjustgroupcode|usetexmodule|usemodule|useluamodule|uprotationangle|uppercasehyphenationmodecode|unsetnodecode|unknownengine|unexpandeddocumentvariable|underscoreasciicode|undefined|typescripttwo|typescriptthree|typescriptone|txtcatcodes|twoperemspace|trueifcode|tpbcatcodes|tpacatcodes|tolerantflagcode|tildeasciicode|threeperemspace|thousandpoint|texengineversion|texenginename|texenginefunctionality|texengine|texcatcodes|tabasciicode|syllablehyphenationmodecode|swapparsshapecode|swaphangindentcode|superscriptcatcode|subscriptcatcode|strictstarthyphenationmodecode|strictendhyphenationmodecode|stoptext|stopproject|stopproduct|stopnotmode|stopnotext|stopnotallmodes|stopmodule|stopmodeset|stopmodeset|stopmode|stopmkivmode|stoplmtxmode|stopenvironment|stopdocument|stopcomponent|stopallmodes|stopTEXpage|starttext|startproject|startproduct|startnotmode|startnotext|startnotallmodes|startmodule|startmodeset|startmodeset|startmode|startmkivmode|startlmtxmode|startenvironment|startdocument|startcomponent|startallmodes|startTEXpage|splitoffgroupcode|splitkeepgroupcode|spacecatcode|spaceasciicode|softhyphen|smallskipamount|slantperpoint|sixperemspace|singlequoteasciicode|simplegroupcode|setupmodule|setupdocument|semisimplegroupcode|scrollmodecode|scaledpoint|rulenodecode|rlm|righttoleftmark|rightrotationangle|rightparentasciicode|rightbracketasciicode|rightbraceasciicode|removemarginkernscode|questionmarkasciicode|pushmode|punctuationspace|prtcatcodes|protectedflagcode|project|product|primitiveflagcode|primeasciicode|preventmode|presetdocument|preamblegroupcode|popmode|points|plustwohundred|plustwo|plustwentythousand|plustwelve|plusthree|plusthousand|plustenthousand|plusten|plussixteen|plussix|plusseven|plusonehundred|plusone|plusnine|plushundred|plusfour|plusfivehundred|plusfive|plusfifty|pluseleven|pluseight|pluscxxviii|pluscxxvii|pluscclvi|pluscclv|permitmathreplacehyphenationmodecode|permitgluehyphenationmodecode|permitallhyphenationmodecode|permanentflagcode|periodasciicode|percentasciicode|penaltynodecode|pdftexengine|parindentskipcode|parfillrightskip|parfillleftskip|parametercatcode|overloadedflagcode|outputnewlinechar|outputgroupcode|othercatcode|optionalspace|onepoint|onemuskip|onebasepoint|oddifcode|numifcode|notcatcodes|normalpagebox|normalizelinecode|normalhyphenationmodecode|norightligaturecode|norightkerncode|noprotrusioncode|nonstopmodecode|nonbreakablespace|noligaturingcode|noleftligaturecode|noleftkerncode|nokerningcode|noexpansioncode|nobreakspace|noaligngroupcode|noalignedflagcode|nilcatcodes|newlineasciicode|narrownobreakspace|mutableflagcode|muquad|morethanasciicode|moduleparameter|mmodeifcode|mksuffix|minustwo|minusone|medskipamount|medcard|maxdimen|maxcount|maxcardminusone|maxcard|mathsnodecode|mathsizesuffix|mathshiftgroupcode|mathshiftcatcode|mathrelcode|mathradicalcode|mathpunctcode|mathordcode|mathopencode|mathopcode|mathnothingcode|mathnolopcode|mathnodecode|mathlimopcode|mathleftgroupcode|mathinnercode|mathgroupcode|mathexheight|mathemwidth|mathclosecode|mathchoicegroupcode|mathchoicecode|mathboxcode|mathbincode|mathaxisheight|mathalphacode|mathaccentcode|mathabovegroupcode|marknodecode|luatexengine|luastringsep|luacatcodes|lrm|localboxgroupcode|ligaturenodecode|lettercatcode|lessthanasciicode|lefttorightmark|leftrotationangle|leftparentasciicode|leftbracketasciicode|leftbraceasciicode|kernnodecode|invalidcatcode|interwordstretch|interwordspace|interwordshrink|instanceflagcode|insertnodecode|insertgroupcode|innerifcode|inicatcodes|immutableflagcode|immediateflagcode|ignorecatcode|ideographicspace|ideographichalffillspace|hyphenasciicode|hmodeifcode|hlistnodecode|hboxifcode|hboxgroupcode|hashasciicode|halfpoint|halfapoint|hairspace|gluenodecode|globalpreventmode|globalflagcode|globalenablemode|globaldisablemode|frozenwidowpenaltycode|frozentolerancecode|frozenstretchcode|frozenskipcode|frozenshapecode|frozenprotrudecode|frozenparfillcode|frozenloosenesscode|frozenlinepenaltycode|frozenlinecode|frozenlastlinecode|frozenindentcode|frozenhsizecode|frozenhangcode|frozenflagcode|frozendisplaypenaltycode|frozendemeritscode|frozenclubpenaltycode|frozenbrokenpenaltycode|frozenallcode|frozenadjustcode|fourperemspace|forwardslashasciicode|formfeedasciicode|fontslantperpoint|fontinterwordstretch|fontinterwordspace|fontinterwordshrink|fontextraspace|fontexheight|fontemwidth|fontcharifcode|fmtversion|fmtname|fiveperemspace|finrowgroupcode|figurespace|falseifcode|extraspace|explicitpenaltyhyphenationmodecode|explicithyphenationmodecode|exheight|exclamationmarkasciicode|everystoptext|everystarttext|escapecatcode|errorstopmodecode|eofifcode|environment|enquad|endoflinetoken|endoflinecatcode|endoflineasciicode|endoffileasciicode|endline|endgroupcatcode|enablemode|emwidth|emquad|emptyvbox|emptytoks|emptyhbox|emptybox|empty|egroup|eUx|downrotationangle|doublequoteasciicode|doublecommentsignal|dollarasciicode|doifnotmode|doifnotdocumentvariable|doifnotallmodes|doifmodeelse|doifmode|doifelsemode|doifelsedocumentvariable|doifelseallmodes|doifdocumentvariableelse|doifdocumentvariable|doifallmodeselse|doifallmodes|documentvariable|discretionarynodecode|discretionarygroupcode|discretionarygroupcode|disablemode|directionrighttoleft|directionlefttoright|dimifcode|delasciicode|definemode|definedifcode|currentmoduleparameter|ctxcatcodes|ctdcatcodes|csnameifcode|continuewhenlmtxmode|continueifinputfile|contextversion|contextmark|contextlmtxmode|contextformat|constantnumberargument|constantnumber|constantemptyargument|constantdimenargument|constantdimen|conditionaltrue|conditionalflagcode|conditionalfalse|compoundhyphenationmodecode|component|completehyphenationmodecode|commentcatcode|commentasciicode|commaasciicode|colonasciicode|circumflexasciicode|charnodecode|charifcode|catifcode|caseifcode|breakafterdircode|breakablethinspace|bottomlevelgroupcode|bigskipamount|bidirlo|bidirle|bidipop|bidilro|bidilre|bgroup|begingroupcatcode|batchmodecode|barasciicode|backslashasciicode|automaticpenaltyhyphenationmodecode|automatichyphenationmodecode|attributeunsetvalue|atsignasciicode|asciispacechar|ampersandasciicode|alignsetgroupcode|alignmentcatcode|aligngroupcode|adjustnodecode|adjustedhboxgroupcode|activetabtoken|activemathcharcode|activeformfeedtoken|activeendoflinetoken|activecatcode|activecatcode|Ux|Umathaccents|!!es|!!bs)(?=[^a-zA-Z])",
+   "match" : "\u005C\u005C(zwnj|zwj|zerowidthspace|zerowidthnonjoiner|zerowidthnobreakspace|zerowidthjoiner|zeroskip|zeropoint|zeromuskip|zerocount|xmlcatcodes|xifcode|xetexengine|wildcardsymbol|whatsitnodecode|vtopgroupcode|vrbcatcodes|voidifcode|voidbox|vmodeifcode|vlistnodecode|vcentergroupcode|vboxifcode|vboxgroupcode|valueflagcode|vadjustgroupcode|usetexmodule|usemodule|useluamodule|uprotationangle|uppercasehyphenationmodecode|unsetnodecode|unknownengine|unexpandeddocumentvariable|underscoreasciicode|undefined|typescripttwo|typescriptthree|typescriptone|txtcatcodes|twoperemspace|trueifcode|tpbcatcodes|tpacatcodes|tolerantflagcode|tildeasciicode|threeperemspace|thousandpoint|texengineversion|texenginename|texenginefunctionality|texengine|texcatcodes|tabasciicode|syllablehyphenationmodecode|swapparsshapecode|swaphangindentcode|superscriptcatcode|subscriptcatcode|strictstarthyphenationmodecode|strictendhyphenationmodecode|stoptext|stopproject|stopproduct|stopnotmode|stopnotext|stopnotallmodes|stopmodule|stopmodeset|stopmodeset|stopmode|stopmkivmode|stoplmtxmode|stopenvironment|stopdocument|stopcomponent|stopallmodes|stopTEXpage|starttext|startproject|startproduct|startnotmode|startnotext|startnotallmodes|startmodule|startmodeset|startmodeset|startmode|startmkivmode|startlmtxmode|startenvironment|startdocument|startcomponent|startallmodes|startTEXpage|splitoffgroupcode|splitkeepgroupcode|spacecatcode|spaceasciicode|softhyphen|smallskipamount|slantperpoint|sixperemspace|singlequoteasciicode|simplegroupcode|setupmodule|setupdocument|semisimplegroupcode|scrollmodecode|scaledpoint|rulenodecode|rlncatcodes|rlm|righttoleftmark|rightrotationangle|rightparentasciicode|rightbracketasciicode|rightbraceasciicode|removemarginkernscode|questionmarkasciicode|pushmode|punctuationspace|prtcatcodes|protectedflagcode|project|product|primitiveflagcode|primeasciicode|preventmode|presetdocument|preamblegroupcode|popmode|points|plustwohundred|plustwo|plustwentythousand|plustwelve|plusthree|plusthousand|plustenthousand|plusten|plussixteen|plussix|plusseven|plusonehundred|plusone|plusnine|plushundred|plusfour|plusfivehundred|plusfive|plusfifty|pluseleven|pluseight|pluscxxviii|pluscxxvii|pluscclvi|pluscclv|permitmathreplacehyphenationmodecode|permitgluehyphenationmodecode|permitallhyphenationmodecode|permanentflagcode|periodasciicode|percentasciicode|penaltynodecode|pdftexengine|parindentskipcode|parfillrightskip|parfillleftskip|parametercatcode|overloadedflagcode|outputnewlinechar|outputgroupcode|othercatcode|optionalspace|onepoint|onemuskip|onebasepoint|oddifcode|numifcode|notcatcodes|normalpagebox|normalizelinecode|normalhyphenationmodecode|norightligaturecode|norightkerncode|noprotrusioncode|nonstopmodecode|nonbreakablespace|noligaturingcode|noleftligaturecode|noleftkerncode|nokerningcode|noexpansioncode|nobreakspace|noaligngroupcode|noalignedflagcode|nilcatcodes|newlineasciicode|narrownobreakspace|mutableflagcode|muquad|morethanasciicode|moduleparameter|mmodeifcode|mksuffix|minustwo|minusone|medskipamount|medcard|maxdimen|maxcount|maxcardminusone|maxcard|mathsnodecode|mathsizesuffix|mathshiftgroupcode|mathshiftcatcode|mathrelcode|mathradicalcode|mathpunctcode|mathordcode|mathopencode|mathopcode|mathnothingcode|mathnolopcode|mathnodecode|mathlimopcode|mathleftgroupcode|mathinnercode|mathgroupcode|mathexheight|mathemwidth|mathclosecode|mathchoicegroupcode|mathchoicecode|mathboxcode|mathbincode|mathaxisheight|mathalphacode|mathaccentcode|mathabovegroupcode|marknodecode|luatexengine|luastringsep|luacatcodes|lrm|localboxgroupcode|ligaturenodecode|lettercatcode|lessthanasciicode|lefttorightmark|leftrotationangle|leftparentasciicode|leftbracketasciicode|leftbraceasciicode|kernnodecode|invalidcatcode|interwordstretch|interwordspace|interwordshrink|instanceflagcode|insertnodecode|insertgroupcode|innerifcode|inicatcodes|immutableflagcode|immediateflagcode|ignorecatcode|ideographicspace|ideographichalffillspace|hyphenasciicode|hmodeifcode|hlistnodecode|hboxifcode|hboxgroupcode|hashasciicode|halfpoint|halfapoint|hairspace|gluenodecode|globalpreventmode|globalflagcode|globalenablemode|globaldisablemode|frozenwidowpenaltycode|frozentolerancecode|frozenstretchcode|frozenskipcode|frozenshapecode|frozenprotrudecode|frozenparfillcode|frozenloosenesscode|frozenlinepenaltycode|frozenlinecode|frozenlastlinecode|frozenindentcode|frozenhsizecode|frozenhangcode|frozenflagcode|frozendisplaypenaltycode|frozendemeritscode|frozenclubpenaltycode|frozenbrokenpenaltycode|frozenallcode|frozenadjustcode|fourperemspace|forwardslashasciicode|formfeedasciicode|fontslantperpoint|fontinterwordstretch|fontinterwordspace|fontinterwordshrink|fontextraspace|fontexheight|fontemwidth|fontcharifcode|fmtversion|fmtname|fiveperemspace|finrowgroupcode|figurespace|falseifcode|extraspace|explicitpenaltyhyphenationmodecode|explicithyphenationmodecode|exheight|exclamationmarkasciicode|everystoptext|everystarttext|escapecatcode|errorstopmodecode|eofifcode|environment|enquad|endoflinetoken|endoflinecatcode|endoflineasciicode|endoffileasciicode|endline|endgroupcatcode|enablemode|emwidth|emquad|emptyvbox|emptytoks|emptyhbox|emptybox|empty|egroup|eUx|downrotationangle|doublequoteasciicode|doublecommentsignal|dollarasciicode|doifnotmode|doifnotdocumentvariable|doifnotallmodes|doifmodeelse|doifmode|doifelsemode|doifelsedocumentvariable|doifelseallmodes|doifdocumentvariableelse|doifdocumentvariable|doifallmodeselse|doifallmodes|documentvariable|discretionarynodecode|discretionarygroupcode|discretionarygroupcode|disablemode|directionrighttoleft|directionlefttoright|dimifcode|delasciicode|definemode|definedifcode|currentmoduleparameter|ctxcatcodes|ctdcatcodes|csnameifcode|continuewhenlmtxmode|continueifinputfile|contextversion|contextmark|contextlmtxmode|contextformat|constantnumberargument|constantnumber|constantemptyargument|constantdimenargument|constantdimen|conditionaltrue|conditionalflagcode|conditionalfalse|compoundhyphenationmodecode|component|completehyphenationmodecode|commentcatcode|commentasciicode|commaasciicode|colonasciicode|circumflexasciicode|charnodecode|charifcode|catifcode|caseifcode|breakafterdircode|breakablethinspace|bottomlevelgroupcode|bigskipamount|bidirlo|bidirle|bidipop|bidilro|bidilre|bgroup|begingroupcatcode|batchmodecode|barasciicode|backslashasciicode|automaticpenaltyhyphenationmodecode|automatichyphenationmodecode|attributeunsetvalue|atsignasciicode|asciispacechar|ampersandasciicode|alignsetgroupcode|alignmentcatcode|aligngroupcode|adjustnodecode|adjustedhboxgroupcode|activetabtoken|activemathcharcode|activeformfeedtoken|activeendoflinetoken|activecatcode|activecatcode|Ux|Umathaccents|!!es|!!bs)(?=[^a-zA-Z])",
    "name" : "context.constant.commands.constant.tex"
   },
   "csname" : {
@@ -88,7 +88,7 @@
    "name" : "context.grouping.symbols.groups.tex"
   },
   "helper" : {
-   "match" : "\u005C\u005C(xmlsetup|writestatus|write|wait|vpenalty|vpackedbox|vpackbox|vkern|vglue|vfillneg|vfilllneg|vfilll|validassignment|uxdef|usedummystyleparameter|usedummystyleandcolor|usedummycolorparameter|usedlineskiplimit|usedlineskip|usedbaselineskip|updateparagraphshapes|updateparagraphproperties|updateparagraphpenalties|updateparagraphlines|updateparagraphdemerits|unvoidbox|unsupportedcs|unprotect|unique|unexpanded|undefinevalue|uncramped|ugdef|uedef|uedcatcodecommand|udef|twodigits|truecondition|tripleexpandafter|triggeruncrampedstyle|triggeruncrampedsmallstyle|triggeruncrampedbigstyle|triggertextstyle|triggersmallstyle|triggerscriptstyle|triggerscriptscriptstyle|triggermathstyle|triggergroupedcommandcs|triggergroupedcommand|triggerdisplaystyle|triggercrampedstyle|triggercrampedsmallstyle|triggercrampedbigstyle|triggerbigstyle|tracingnone|tracingall|to|threedigits|thirdofthreeunexpanded|thirdofthreearguments|thirdofsixarguments|thirdoffourarguments|thirdoffivearguments|thirdargumenttrue|thirdargumentfalse|then|thebox|textdir|texsetup|texdefinition|synchronizelayoutdirection|synchronizeinlinedirection|synchronizedisplaydirection|superscript|superprescript|subscript|subprescript|strutwd|struthtdp|strutht|strutgap|strutdp|strutbox|strut|strippedcsname|stopxmlsetups|stoptexsetups|stoptexdefinition|stoptexcode|stopsetups|stoprawsetups|stoppickupmath|stopnointerference|stopluasetups|stopluaparameterset|stopluacode|stoplua|stoplocalsetups|stopimath|stopforceddisplaymath|stopextendcatcodetable|stopexpanded|stopdmath|stopctxfunctiondefinition|stopctxfunction|stopcontextdefinitioncode|stopcontextcode|stopcatcodetable|stop|startxmlsetups|starttexsetups|starttexdefinition|starttexcode|startsetups|startrawsetups|startpickupmath|startnointerference|startluasetups|startluaparameterset|startluacode|startlua|startlocalsetups|startimath|startforceddisplaymath|startextendcatcodetable|startexpanded|startdmath|startctxfunctiondefinition|startctxfunction|startcontextdefinitioncode|startcontextcode|startcatcodetable|start|space|sixthofsixarguments|sixthargumenttrue|sixthargumentfalse|singleexpandafter|simplegroupedcommand|signalcharacter|showluatokens|shiftbox|seventhargumenttrue|seventhargumentfalse|setxvalue|setxquantity|setxmeasure|setvalue|setuxvalue|setuvalue|setups|setup|setugvalue|setuevalue|settruevalue|settrue|setsystemmode|setstrut|setquantity|setprelistbox|setpostlistbox|setparagraphfreezing|setnewmacro|setnewconstant|setmode|setmeasure|setmathtextbox|setmathsmalltextbox|setlocalhsize|setgvalue|setgquantity|setgmeasure|setfalsevalue|setfalse|setexpandeddummyparameter|setevalue|setequantity|setemeasure|setdummyparameter|setcontrolspaces|setconstantvalue|setconstant|setconditional|setcatcodetable|setboxline|secondoftwounexpanded|secondoftwoarguments|secondofthreeunexpanded|secondofthreearguments|secondofsixarguments|secondoffourarguments|secondoffivearguments|secondargumenttrue|secondargumentfalse|scratchyposition|scratchyoffset|scratchxposition|scratchxoffset|scratchwidth|scratchvsize|scratchvoffset|scratchunicode|scratchtotal|scratchtopskip|scratchtopoffset|scratchtokstwo|scratchtoksthree|scratchtokssix|scratchtoksone|scratchtoksfour|scratchtoksfive|scratchtoks|scratchskiptwo|scratchskipthree|scratchskipsix|scratchskipone|scratchskipfour|scratchskipfive|scratchskip|scratchrightskip|scratchrightoffset|scratchoffset|scratchny|scratchnx|scratchmy|scratchmx|scratchmuskiptwo|scratchmuskipthree|scratchmuskipsix|scratchmuskipone|scratchmuskipfour|scratchmuskipfive|scratchmuskip|scratchmin|scratchmax|scratchmacrotwo|scratchmacroone|scratchmacro|scratchleftskip|scratchleftoffset|scratchhsize|scratchhoffset|scratchheight|scratchdistance|scratchdimentwo|scratchdimenthree|scratchdimensix|scratchdimenone|scratchdimenfour|scratchdimenfive|scratchdimen|scratchdepth|scratchcountertwo|scratchcounterthree|scratchcountersix|scratchcounterone|scratchcounterfour|scratchcounterfive|scratchcounter|scratchconditiontwotrue|scratchconditiontwofalse|scratchconditiontrue|scratchconditiononetrue|scratchconditiononefalse|scratchconditionfalse|scratchboxtwo|scratchboxthree|scratchboxsix|scratchboxone|scratchboxfour|scratchboxfive|scratchbox|scratchbottomskip|scratchbottomoffset|scangivendimensions|ruledvtop|ruledvss|ruledvskip|ruledvpack|ruledvglue|ruledvfilneg|ruledvfillneg|ruledvfilll|ruledvfill|ruledvfil|ruledvcenter|ruledvbox|ruledtpack|ruledpenalty|ruledmskip|ruledmkern|ruledmbox|ruledkern|ruledhss|ruledhskip|ruledhpack|ruledhglue|ruledhfilneg|ruledhfillneg|ruledhfilll|ruledhfill|ruledhfil|ruledhbox|rtlvtop|rtlvbox|rtlhbox|righttoleftvtop|righttoleftvbox|righttolefthbox|righttoleft|rightboundary|reversevtop|reversevpack|reversevbox|reversetpack|reversehpack|reversehbox|restorecatcodes|resetvalue|resetsystemmode|resetsetups|resetmode|resetglobal|reseteverypar|resetctxscanner|reqno|removeunwantedspaces|removetoks|removepunctuation|removelastspace|relrelspacing|relpunctspacing|relordspacing|relopspacing|relopenspacing|relinnerspacing|relclosespacing|relbinspacing|registerctxluafile|redoglobal|redefine|recurselevel|recursedepth|readline|readfromterminal|read|quitprevcommalist|quitcondition|quitcommalist|quarterstrut|quantity|quantitied|quad|pushsystemmode|pushoverloadmode|pushmathstyle|pushcatcodetable|punctrelspacing|punctpunctspacing|punctordspacing|punctopspacing|punctopenspacing|punctinnerspacing|punctclosespacing|punctbinspacing|protect|processfirstactioninset|processcommalist|processcommacommand|processallactionsinset|processallactions|processaction|privatescratchtoks|privatescratchskip|privatescratchmuskip|privatescratchdimen|privatescratchcounter|privatescratchbox|prependtotoks|prependtoks|prelistcopy|prelistbox|postlistcopy|postlistbox|popsystemmode|popoverloadmode|popmathstyle|popcatcodetable|pickupgroupedcommand|permitspacesbetweengroups|pardir|ordrelspacing|ordpunctspacing|ordordspacing|ordopspacing|ordopenspacing|ordinnerspacing|ordclosespacing|ordbinspacing|oprelspacing|oppunctspacing|opordspacing|opopspacing|opopenspacing|opinnerspacing|openrelspacing|openpunctspacing|openout|openordspacing|openopspacing|openopenspacing|openinnerspacing|openin|openclosespacing|openbinspacing|opclosespacing|opbinspacing|onlypdfobjectcompression|onlynonbreakablespace|oninterlineskip|offinterlineskip|obeytabs|obeyspaces|obeypages|obeyluatokens|obeylualines|obeylines|obeyedtab|obeyedspace|obeyedpage|obeyedline|null|novalidassignment|nosuperscript|nosuperprescript|nosubsprecript|nosubscript|nospacing|nospace|normalvglue|normalvfillneg|normalvfilllneg|normalsuperscript|normalsubscript|normalstopimath|normalstopdmath|normalstartimath|normalstartdmath|normalspaces|normalspace|normalreqno|normalpdfcompression|normalnosuperscript|normalnosubscript|normalhglue|normalhfillneg|normalhfilllneg|noprotrusion|nopdfobjectcompression|nopdfcompression|noligaturing|nokerning|nointerlineskip|nohyphens|noheightstrut|nofarguments|noexpansion|nobreak|nexttoken|nextbox|next|newwrite|newtoks|newsystemmode|newskip|newsignal|newread|newmuskip|newmode|newmarks|newmacro|newlanguage|newinsert|newif|newhelp|newfraction|newfamily|newfam|newdimen|newcount|newconstant|newconditional|newcatcodetable|newbox|newattribute|nbsp|naturalvtop|naturalvpack|naturalvbox|naturaltpack|naturalspace|naturalhpack|naturalhbox|morehyphens|modulonumber|measured|measure|maximumpdfcompression|mathtext|mathstylevcenteredvbox|mathstylevcenteredhbox|mathstylevcenter|mathstylevbox|mathstyletrigger|mathstylehbox|mathstylefont|mathstyleface|mathstylecommand|mathsmallstylefont|mathsmallstyleface|mathpalette|mathortext|mathnothing|mathnolop|mathlimop|mathbox|mathalpha|luaversion|luasetup|luaparameterset|luaminorversion|luamajorversion|luaexpr|luaexpanded|luaconditional|luacode|ltrvtop|ltrvbox|ltrhbox|loggingall|localhsize|lineheight|linedir|letvalue|letgvalue|letdummyparameter|letcatcodecommand|letbackslashbreak|lesshyphens|lefttorightvtop|lefttorightvbox|lefttorighthbox|lefttoright|leftorrightvtop|leftorrightvbox|leftorrighthbox|leftorright|leftboundary|lateluacode|lastlinewidth|keepunwantedspaces|installprotectedctxscanner|installprotectedctxfunction|installctxscanner|installctxfunction|installcorenamespace|innerrelspacing|innerpunctspacing|innerordspacing|inneropspacing|inneropenspacing|innerinnerspacing|innerclosespacing|innerbinspacing|inlineordisplaymath|indisplaymath|ignorevalue|ignoretabs|ignoreparskip|ignorepages|ignorelines|ignoreeofs|ifscratchconditiontwo|ifscratchconditionone|ifscratchcondition|ifbitwiseand|htdp|hsizefraction|hpenalty|hpackedbox|hpackbox|hkern|hglue|hfillneg|hfilllneg|hfilll|halfstrut|halflinestrut|groupedcommandcs|groupedcommand|goodbreak|gobbletwooptionals|gobbletwoarguments|gobblethreeoptionals|gobblethreearguments|gobbletenarguments|gobblesixarguments|gobblesevenarguments|gobbleoneoptional|gobbleoneargument|gobbleninearguments|gobblefouroptionals|gobblefourarguments|gobblefiveoptionals|gobblefivearguments|gobbleeightarguments|globalsetsystemmode|globalsetmode|globalscratchtoks|globalscratchskip|globalscratchmuskip|globalscratchdimen|globalscratchcountertwo|globalscratchcounterthree|globalscratchcounterone|globalscratchcounter|globalscratchbox|globalresetsystemmode|globalresetmode|globallet|glet|givenwidth|givenheight|givendepth|getxparameters|getvalue|getuvalue|getparameters|getgparameters|getfirstcharacter|geteparameters|getdummyparameters|futureletnexttoken|frule|freezequantity|freezeparagraphproperties|freezemeasure|fourthofsixarguments|fourthoffourarguments|fourthoffivearguments|fourthargumenttrue|fourthargumentfalse|foundtrue|foundfalse|forgetparameters|forgetparagraphfreezing|forgetall|forcestrutdepth|forcedisplaymath|flushnextbox|firstoftwounexpanded|firstoftwoarguments|firstofthreeunexpanded|firstofthreearguments|firstofsixarguments|firstofoneunexpanded|firstofoneargument|firstoffourarguments|firstoffivearguments|firstinset|firstargumenttrue|firstargumentfalse|finishpar|filledhboxy|filledhboxr|filledhboxm|filledhboxk|filledhboxg|filledhboxc|filledhboxb|fifthofsixarguments|fifthoffivearguments|fifthargumenttrue|fifthargumentfalse|fastsetup|fastloopindex|fastloopfinal|falsecondition|expelsedoif|expdoifnot|expdoifinsetelse|expdoifelseinset|expdoifelsecommon|expdoifcommonelse|expdoif|expanded|exitloop|executeifdefined|enspace|endstrut|endpar|endgraf|emspace|empty|dummyparameter|dowithnextboxcs|dowithnextboxcontentcs|dowithnextboxcontent|dowithnextbox|dowith|doubleexpandafter|dotriplegroupempty|dotripleempty|dotripleargument|dostepwiserecurse|dospacing|dosixtupleempty|dosixtupleargument|dosinglegroupempty|dosingleempty|dosingleargument|doseventupleempty|doseventupleargument|dorecurse|doquintuplegroupempty|doquintupleempty|doquintupleargument|doquadruplegroupempty|doquadrupleempty|doquadrupleargument|dontpermitspacesbetweengroups|dontleavehmode|dontcomplain|donothing|donetrue|donefalse|doloopovermatched|doloopovermatch|doloopoverlist|doloop|doifvaluesomething|doifvaluenothingelse|doifvaluenothing|doifvalue|doifundefinedelse|doifundefined|doiftextelse|doiftext|doifsomethingelse|doifsomething|doifsetupselse|doifsetups|doifnumberelse|doifnumber|doifnotvalue|doifnottext|doifnotsetups|doifnotnumber|doifnotinstring|doifnotinset|doifnothingelse|doifnothing|doifnotcommon|doifnotcommandhandler|doifnot|doifnextparenthesiselse|doifnextoptionalelse|doifnextoptionalcselse|doifnextcharelse|doifnextcharcselse|doifnextbgroupelse|doifnextbgroupcselse|doifinstringelse|doifinstring|doifinsetelse|doifinset|doiffirstcharelse|doiffastoptionalcheckelse|doiffastoptionalcheckcselse|doifelsevaluenothing|doifelsevalue|doifelseundefined|doifelsetext|doifelsesomething|doifelsesetups|doifelsenumber|doifelsenothing|doifelsenextparenthesis|doifelsenextoptionalcs|doifelsenextoptional|doifelsenextcharcs|doifelsenextchar|doifelsenextbgroupcs|doifelsenextbgroup|doifelseinstring|doifelseinset|doifelsefirstchar|doifelsefastoptionalcheckcs|doifelsefastoptionalcheck|doifelsedimension|doifelsedefined|doifelsecommon|doifelsecommandhandler|doifelseassignmentcs|doifelseassignment|doifelse|doifdimensionelse|doifdefinedelse|doifdefined|doifcommonelse|doifcommon|doifcommandhandlerelse|doifcommandhandler|doifassignmentelsecs|doifassignmentelse|doif|dohyphens|doglobal|dofastloopcs|dodoublegroupempty|dodoubleempty|dodoubleargument|dodoglobal|docheckassignment|dividenumber|distributedhsize|dirrlo|dirrle|dirlro|dirlre|directsetup|directquantity|directmeasure|directluacode|directdummyparameter|depthstrut|defrostparagraphproperties|definequantity|definenamedlua|definemeasure|defineexpandable|define|defcatcodecommand|defbackslashbreak|defaultcatcodetable|currentcatcodetable|ctxwrite|ctxsprint|ctxreport|ctxluamatch|ctxluacode|ctxlua|ctxloadluafile|ctxlatelua|ctxlatecommand|ctxfunction|ctxdirectlua|ctxdirectcommand|ctxcommand|crlf|cramped|copysetups|copyparameters|copyboxline|controlspace|compoundhyphenpenalty|compounddiscretionary|closerelspacing|closepunctspacing|closeout|closeordspacing|closeopspacing|closeopenspacing|closeinnerspacing|closein|closeclosespacing|closebinspacing|cldprocessfile|cldloadviafile|cldloadfile|cldcontext|cldcommand|checkedstrippedcsname|checkedrighttoleft|checkedlefttoright|checked|charspace|catcodetablename|carryoverpar|break|boxrangewd|boxrangeht|boxrangedp|boxlinewd|boxlines|boxliners|boxlinerp|boxlinerh|boxlinenw|boxlinenh|boxlinend|boxlinels|boxlinelp|boxlinelh|boxlinein|boxlineht|boxlinedp|boxline|boxisempty|boxdir|booleanmodevalue|bitwisexor|bitwiseshift|bitwiseset|bitwiseor|bitwisenot|bitwisenil|bitwiseflip|bitwiseand|bitwise|binrelspacing|binpunctspacing|binordspacing|binopspacing|binopenspacing|bininnerspacing|binclosespacing|binbinspacing|begstrut|begcsname|availablehsize|autorule|autodirvtop|autodirvbox|autodirhbox|assumelongusagecs|appendtotoks|appendtoks|allowbreak|aliasmacro|Umathtopaccent|Umathbotaccent|Ucheckedstopdisplaymath|Ucheckedstartdisplaymath)(?=[^a-zA-Z])",
+   "match" : "\u005C\u005C(xmlsetup|writestatus|write|wait|vpenalty|vpackedbox|vpackbox|vkern|vglue|vfillneg|vfilllneg|vfilll|validassignment|uxdef|usedummystyleparameter|usedummystyleandcolor|usedummycolorparameter|usedlineskiplimit|usedlineskip|usedbaselineskip|updateparagraphshapes|updateparagraphproperties|updateparagraphpenalties|updateparagraphlines|updateparagraphdemerits|unvoidbox|unsupportedcs|unprotect|unique|unexpanded|undefinevalue|uncramped|ugdef|uedef|uedcatcodecommand|udef|twodigits|truecondition|tripleexpandafter|triggeruncrampedstyle|triggeruncrampedsmallstyle|triggeruncrampedbigstyle|triggertextstyle|triggersmallstyle|triggerscriptstyle|triggerscriptscriptstyle|triggermathstyle|triggergroupedcommandcs|triggergroupedcommand|triggerdisplaystyle|triggercrampedstyle|triggercrampedsmallstyle|triggercrampedbigstyle|triggerbigstyle|tracingnone|tracingall|to|threedigits|thirdofthreeunexpanded|thirdofthreearguments|thirdofsixarguments|thirdoffourarguments|thirdoffivearguments|thirdargumenttrue|thirdargumentfalse|then|thebox|textdir|texsetup|texdefinition|synchronizelayoutdirection|synchronizeinlinedirection|synchronizedisplaydirection|superscript|superprescript|subscript|subprescript|strutwd|struthtdp|strutht|strutgap|strutdp|strutbox|strut|strippedcsname|stopxmlsetups|stoptexsetups|stoptexdefinition|stoptexcode|stopsetups|stoprawsetups|stoppickupmath|stopnointerference|stopluasetups|stopluaparameterset|stopluacode|stoplua|stoplocalsetups|stopimath|stopforceddisplaymath|stopextendcatcodetable|stopexpanded|stopdmath|stopctxfunctiondefinition|stopctxfunction|stopcontextdefinitioncode|stopcontextcode|stopcatcodetable|stop|startxmlsetups|starttexsetups|starttexdefinition|starttexcode|startsetups|startrawsetups|startpickupmath|startnointerference|startluasetups|startluaparameterset|startluacode|startlua|startlocalsetups|startimath|startforceddisplaymath|startextendcatcodetable|startexpanded|startdmath|startctxfunctiondefinition|startctxfunction|startcontextdefinitioncode|startcontextcode|startcatcodetable|start|space|sixthofsixarguments|sixthargumenttrue|sixthargumentfalse|singleexpandafter|simplegroupedcommand|signalcharacter|showluatokens|shiftbox|seventhargumenttrue|seventhargumentfalse|setxvalue|setxquantity|setxmeasure|setvalue|setuxvalue|setuvalue|setups|setup|setugvalue|setuevalue|settruevalue|settrue|setsystemmode|setstrut|setquantity|setprelistbox|setpostlistbox|setparagraphfreezing|setnewmacro|setnewconstant|setmode|setmeasure|setmathtextbox|setmathsmalltextbox|setlocalhsize|setgvalue|setgquantity|setgmeasure|setfalsevalue|setfalse|setexpandeddummyparameter|setevalue|setequantity|setemeasure|setdummyparameter|setcontrolspaces|setconstantvalue|setconstant|setconditional|setcatcodetable|setboxline|secondoftwounexpanded|secondoftwoarguments|secondofthreeunexpanded|secondofthreearguments|secondofsixarguments|secondoffourarguments|secondoffivearguments|secondargumenttrue|secondargumentfalse|scratchyposition|scratchyoffset|scratchxposition|scratchxoffset|scratchwidth|scratchvsize|scratchvoffset|scratchunicode|scratchtotal|scratchtopskip|scratchtopoffset|scratchtokstwo|scratchtoksthree|scratchtokssix|scratchtoksone|scratchtoksfour|scratchtoksfive|scratchtoks|scratchskiptwo|scratchskipthree|scratchskipsix|scratchskipone|scratchskipfour|scratchskipfive|scratchskip|scratchrightskip|scratchrightoffset|scratchoffset|scratchny|scratchnx|scratchmy|scratchmx|scratchmuskiptwo|scratchmuskipthree|scratchmuskipsix|scratchmuskipone|scratchmuskipfour|scratchmuskipfive|scratchmuskip|scratchmin|scratchmax|scratchmacrotwo|scratchmacroone|scratchmacro|scratchleftskip|scratchleftoffset|scratchhsize|scratchhoffset|scratchheight|scratchdistance|scratchdimentwo|scratchdimenthree|scratchdimensix|scratchdimenone|scratchdimenfour|scratchdimenfive|scratchdimen|scratchdepth|scratchcountertwo|scratchcounterthree|scratchcountersix|scratchcounterone|scratchcounterfour|scratchcounterfive|scratchcounter|scratchconditiontwotrue|scratchconditiontwofalse|scratchconditiontrue|scratchconditiononetrue|scratchconditiononefalse|scratchconditionfalse|scratchboxtwo|scratchboxthree|scratchboxsix|scratchboxone|scratchboxfour|scratchboxfive|scratchbox|scratchbottomskip|scratchbottomoffset|scangivendimensions|ruledvtop|ruledvss|ruledvskip|ruledvpack|ruledvglue|ruledvfilneg|ruledvfillneg|ruledvfilll|ruledvfill|ruledvfil|ruledvcenter|ruledvbox|ruledtpack|ruledpenalty|ruledmskip|ruledmkern|ruledmbox|ruledkern|ruledhss|ruledhskip|ruledhpack|ruledhglue|ruledhfilneg|ruledhfillneg|ruledhfilll|ruledhfill|ruledhfil|ruledhbox|rtlvtop|rtlvbox|rtlhbox|righttoleftvtop|righttoleftvbox|righttolefthbox|righttoleft|rightboundary|reversevtop|reversevpack|reversevbox|reversetpack|reversehpack|reversehbox|restorecatcodes|resetvalue|resetsystemmode|resetsetups|resetmode|resetglobal|reseteverypar|resetctxscanner|reqno|removeunwantedspaces|removetoks|removepunctuation|removelastspace|relrelspacing|relpunctspacing|relordspacing|relopspacing|relopenspacing|relinnerspacing|relclosespacing|relbinspacing|registerctxluafile|redoglobal|redefine|recurselevel|recursedepth|readline|readfromterminal|read|quitprevcommalist|quitcondition|quitcommalist|quarterstrut|quantity|quantitied|quad|pushsystemmode|pushoverloadmode|pushmathstyle|pushcatcodetable|punctrelspacing|punctpunctspacing|punctordspacing|punctopspacing|punctopenspacing|punctinnerspacing|punctclosespacing|punctbinspacing|protect|processfirstactioninset|processcommalist|processcommacommand|processallactionsinset|processallactions|processaction|privatescratchtoks|privatescratchskip|privatescratchmuskip|privatescratchdimen|privatescratchcounter|privatescratchbox|prependtotoks|prependtoks|prelistcopy|prelistbox|postlistcopy|postlistbox|popsystemmode|popoverloadmode|popmathstyle|popcatcodetable|pickupgroupedcommand|permitspacesbetweengroups|pardir|ordrelspacing|ordpunctspacing|ordordspacing|ordopspacing|ordopenspacing|ordinnerspacing|ordclosespacing|ordbinspacing|oprelspacing|oppunctspacing|opordspacing|opopspacing|opopenspacing|opinnerspacing|openrelspacing|openpunctspacing|openout|openordspacing|openopspacing|openopenspacing|openinnerspacing|openin|openclosespacing|openbinspacing|opclosespacing|opbinspacing|onlypdfobjectcompression|onlynonbreakablespace|oninterlineskip|offinterlineskip|obeytabs|obeyspaces|obeypages|obeyluatokens|obeylualines|obeylines|obeyedtab|obeyedspace|obeyedpage|obeyedline|null|novalidassignment|nosuperscript|nosuperprescript|nosubsprecript|nosubscript|nospacing|nospace|normalvglue|normalvfillneg|normalvfilllneg|normalsuperscript|normalsubscript|normalstopimath|normalstopdmath|normalstartimath|normalstartdmath|normalspaces|normalspace|normalreqno|normalpdfcompression|normalnosuperscript|normalnosubscript|normalhglue|normalhfillneg|normalhfilllneg|noprotrusion|nopdfobjectcompression|nopdfcompression|noligaturing|nokerning|nointerlineskip|nohyphens|noheightstrut|nofarguments|noexpansion|nobreak|nexttoken|nextbox|next|newwrite|newtoks|newsystemmode|newskip|newsignal|newread|newmuskip|newmode|newmarks|newmacro|newlanguage|newinsert|newif|newhelp|newfraction|newfamily|newfam|newdimen|newcount|newconstant|newconditional|newcatcodetable|newbox|newattribute|nbsp|naturalvtop|naturalvpack|naturalvbox|naturaltpack|naturalspace|naturalhpack|naturalhbox|morehyphens|modulonumber|measured|measure|maximumpdfcompression|mathtext|mathstylevcenteredvbox|mathstylevcenteredhbox|mathstylevcenter|mathstylevbox|mathstyletrigger|mathstylehbox|mathstylefont|mathstyleface|mathstylecommand|mathsmallstylefont|mathsmallstyleface|mathpalette|mathortext|mathnothing|mathnolop|mathlimop|mathbox|mathalpha|luaversion|luasetup|luaparameterset|luaminorversion|luamajorversion|luaexpr|luaexpanded|luaconditional|luacode|ltrvtop|ltrvbox|ltrhbox|loggingall|localhsize|lineheight|linedir|letvalue|letgvalue|letdummyparameter|letcatcodecommand|letbackslashbreak|lesshyphens|lefttorightvtop|lefttorightvbox|lefttorighthbox|lefttoright|leftorrightvtop|leftorrightvbox|leftorrighthbox|leftorright|leftboundary|lateluacode|lastlinewidth|keepunwantedspaces|installprotectedctxscanner|installprotectedctxfunction|installctxscanner|installctxfunction|installcorenamespace|innerrelspacing|innerpunctspacing|innerordspacing|inneropspacing|inneropenspacing|innerinnerspacing|innerclosespacing|innerbinspacing|inlineordisplaymath|indisplaymath|ignorevalue|ignoretabs|ignoreparskip|ignorepages|ignorelines|ignoreeofs|ifscratchconditiontwo|ifscratchconditionone|ifscratchcondition|ifbitwiseand|htdp|hsizefraction|hpenalty|hpackedbox|hpackbox|hkern|hglue|hfillneg|hfilllneg|hfilll|halfstrut|halflinestrut|groupedcommandcs|groupedcommand|goodbreak|gobbletwooptionals|gobbletwoarguments|gobblethreeoptionals|gobblethreearguments|gobbletenarguments|gobblesixarguments|gobblesevenarguments|gobbleoneoptional|gobbleoneargument|gobbleninearguments|gobblefouroptionals|gobblefourarguments|gobblefiveoptionals|gobblefivearguments|gobbleeightarguments|globalsetsystemmode|globalsetmode|globalscratchtoks|globalscratchskip|globalscratchmuskip|globalscratchdimen|globalscratchcountertwo|globalscratchcounterthree|globalscratchcounterone|globalscratchcounter|globalscratchbox|globalresetsystemmode|globalresetmode|globallet|givenwidth|givenheight|givendepth|getxparameters|getvalue|getuvalue|getparameters|getgparameters|getfirstcharacter|geteparameters|getdummyparameters|futureletnexttoken|frule|freezequantity|freezeparagraphproperties|freezemeasure|fourthofsixarguments|fourthoffourarguments|fourthoffivearguments|fourthargumenttrue|fourthargumentfalse|foundtrue|foundfalse|forgetparameters|forgetparagraphfreezing|forgetall|forcestrutdepth|forcedisplaymath|flushnextbox|firstoftwounexpanded|firstoftwoarguments|firstofthreeunexpanded|firstofthreearguments|firstofsixarguments|firstofoneunexpanded|firstofoneargument|firstoffourarguments|firstoffivearguments|firstinset|firstargumenttrue|firstargumentfalse|finishpar|filledhboxy|filledhboxr|filledhboxm|filledhboxk|filledhboxg|filledhboxc|filledhboxb|fifthofsixarguments|fifthoffivearguments|fifthargumenttrue|fifthargumentfalse|fastsetup|fastloopindex|fastloopfinal|falsecondition|expelsedoif|expdoifnot|expdoifinsetelse|expdoifelseinset|expdoifelsecommon|expdoifcommonelse|expdoif|expanded|exitloop|executeifdefined|enspace|endstrut|endpar|endgraf|emspace|empty|dummyparameter|dowithnextboxcs|dowithnextboxcontentcs|dowithnextboxcontent|dowithnextbox|dowith|doubleexpandafter|dotriplegroupempty|dotripleempty|dotripleargument|dostepwiserecurse|dospacing|dosixtupleempty|dosixtupleargument|dosinglegroupempty|dosingleempty|dosingleargument|doseventupleempty|doseventupleargument|dorecurse|doquintuplegroupempty|doquintupleempty|doquintupleargument|doquadruplegroupempty|doquadrupleempty|doquadrupleargument|dontpermitspacesbetweengroups|dontleavehmode|dontcomplain|donothing|donetrue|donefalse|doloopovermatched|doloopovermatch|doloopoverlist|doloop|doifvaluesomething|doifvaluenothingelse|doifvaluenothing|doifvalue|doifundefinedelse|doifundefined|doiftextelse|doiftext|doifsomethingelse|doifsomething|doifsetupselse|doifsetups|doifnumberelse|doifnumber|doifnotvalue|doifnottext|doifnotsetups|doifnotnumber|doifnotinstring|doifnotinset|doifnothingelse|doifnothing|doifnotcommon|doifnotcommandhandler|doifnot|doifnextparenthesiselse|doifnextoptionalelse|doifnextoptionalcselse|doifnextcharelse|doifnextcharcselse|doifnextbgroupelse|doifnextbgroupcselse|doifinstringelse|doifinstring|doifinsetelse|doifinset|doiffirstcharelse|doiffastoptionalcheckelse|doiffastoptionalcheckcselse|doifelsevaluenothing|doifelsevalue|doifelseundefined|doifelsetext|doifelsesomething|doifelsesetups|doifelsenumber|doifelsenothing|doifelsenextparenthesis|doifelsenextoptionalcs|doifelsenextoptional|doifelsenextcharcs|doifelsenextchar|doifelsenextbgroupcs|doifelsenextbgroup|doifelseinstring|doifelseinset|doifelsefirstchar|doifelsefastoptionalcheckcs|doifelsefastoptionalcheck|doifelsedimension|doifelsedefined|doifelsecommon|doifelsecommandhandler|doifelseassignmentcs|doifelseassignment|doifelse|doifdimensionelse|doifdefinedelse|doifdefined|doifcommonelse|doifcommon|doifcommandhandlerelse|doifcommandhandler|doifassignmentelsecs|doifassignmentelse|doif|dohyphens|doglobal|dofastloopcs|dodoublegroupempty|dodoubleempty|dodoubleargument|dodoglobal|docheckassignment|dividenumber|distributedhsize|dirrlo|dirrle|dirlro|dirlre|directsetup|directquantity|directmeasure|directluacode|directdummyparameter|depthstrut|defrostparagraphproperties|definequantity|definenamedlua|definemeasure|defineexpandable|define|defcatcodecommand|defbackslashbreak|defaultcatcodetable|currentcatcodetable|ctxwrite|ctxsprint|ctxreport|ctxluamatch|ctxluacode|ctxlua|ctxloadluafile|ctxlatelua|ctxlatecommand|ctxfunction|ctxdirectlua|ctxdirectcommand|ctxcommand|crlf|cramped|copysetups|copyparameters|copyboxline|controlspace|compoundhyphenpenalty|compounddiscretionary|closerelspacing|closepunctspacing|closeout|closeordspacing|closeopspacing|closeopenspacing|closeinnerspacing|closein|closeclosespacing|closebinspacing|cldprocessfile|cldloadviafile|cldloadfile|cldcontext|cldcommand|checkedstrippedcsname|checkedrighttoleft|checkedlefttoright|checked|charspace|catcodetablename|carryoverpar|break|boxrangewd|boxrangeht|boxrangedp|boxlinewd|boxlines|boxliners|boxlinerp|boxlinerh|boxlinenw|boxlinenh|boxlinend|boxlinels|boxlinelp|boxlinelh|boxlinein|boxlineht|boxlinedp|boxline|boxisempty|boxdir|booleanmodevalue|bitwisexor|bitwiseshift|bitwiseset|bitwiseor|bitwisenot|bitwisenil|bitwiseflip|bitwiseand|bitwise|binrelspacing|binpunctspacing|binordspacing|binopspacing|binopenspacing|bininnerspacing|binclosespacing|binbinspacing|begstrut|begcsname|availablehsize|autorule|autodirvtop|autodirvbox|autodirhbox|assumelongusagecs|appendtotoks|appendtoks|allowbreak|aliasmacro|Umathtopaccent|Umathbotaccent|Ucheckedstopdisplaymath|Ucheckedstartdisplaymath)(?=[^a-zA-Z])",
    "name" : "context.plain.commands.plain.tex"
   },
   "ifprimitive" : {
@@ -215,7 +215,7 @@
    ]
   },
   "primitive" : {
-   "match" : "\u005C\u005C(year|xtokspre|xtoksapp|xspaceskip|xleaders|xdefcsname|xdef|wrapuppar|wordboundary|widowpenalty|widowpenalties|wd|vtop|vss|vsplit|vskip|vsize|vrule|vpack|vfuzz|vfilneg|vfill|vfil|vcenter|vbox|vbadness|valign|vadjust|uppercase|unvpack|unvcopy|unvbox|unskip|unpenalty|unletprotected|unletfrozen|unless|unkern|unhpack|unhcopy|unhbox|underline|undent|uchyph|uccode|tracingstats|tracingrestores|tracingparagraphs|tracingpages|tracingoutput|tracingonline|tracingnesting|tracingmath|tracingmacros|tracinglostchars|tracingifs|tracinggroups|tracingfonts|tracingcommands|tracingassigns|tracingalignments|tpack|toscaled|topskip|topmarks|topmark|tolerant|tolerance|tokspre|toksdef|toksapp|toks|tokenized|tointeger|todimension|time|thinmuskip|thickmuskip|thewithoutunit|the|textstyle|textfont|textdirection|tabskip|swapcsvalues|supmarkmode|string|splittopskip|splitmaxdepth|splitfirstmarks|splitfirstmark|splitdiscards|splitbotmarks|splitbotmark|span|spaceskip|spacefactor|snapshotpar|skipdef|skip|skewchar|showtokens|showthe|shownodedetails|showlists|showifs|showgroups|showboxdepth|showboxbreadth|showbox|show|shipout|sfcode|setlanguage|setfontid|setbox|scrollmode|scriptstyle|scriptspace|scriptscriptstyle|scriptscriptfont|scriptfont|scantokens|scantextokens|savingvdiscards|savinghyphcodes|savecatcodetable|rpcode|romannumeral|rightskip|rightmarginkern|righthyphenmin|right|relpenalty|relax|raise|radical|quitvmode|pxdimen|protrusionboundary|protrudechars|protected|prevgraf|prevdepth|pretolerance|prerelpenalty|prehyphenchar|preexhyphenchar|predisplaysize|predisplaypenalty|predisplaygapfactor|predisplaydirection|prebinoppenalty|posthyphenchar|postexhyphenchar|postdisplaypenalty|permanent|penalty|pdfximage|pdfxformresources|pdfxformname|pdfxformmargin|pdfxformattr|pdfxform|pdfvorigin|pdfuniqueresname|pdfuniformdeviate|pdftrailerid|pdftrailer|pdftracingfonts|pdfthreadmargin|pdfthread|pdftexversion|pdftexrevision|pdftexbanner|pdfsuppressptexinfo|pdfsuppressoptionalinfo|pdfstartthread|pdfstartlink|pdfsetrandomseed|pdfsetmatrix|pdfsavepos|pdfsave|pdfretval|pdfrestore|pdfreplacefont|pdfrefximage|pdfrefxform|pdfrefobj|pdfrecompress|pdfrandomseed|pdfpxdimen|pdfprotrudechars|pdfprimitive|pdfpkresolution|pdfpkmode|pdfpkfixeddpi|pdfpagewidth|pdfpagesattr|pdfpageresources|pdfpageref|pdfpageheight|pdfpagebox|pdfpageattr|pdfoutput|pdfoutline|pdfomitcidset|pdfomitcharset|pdfobjcompresslevel|pdfobj|pdfnormaldeviate|pdfnoligatures|pdfnames|pdfminorversion|pdfmapline|pdfmapfile|pdfmajorversion|pdfliteral|pdflinkmargin|pdflastypos|pdflastxpos|pdflastximagepages|pdflastximage|pdflastxform|pdflastobj|pdflastlink|pdflastlinedepth|pdflastannot|pdfinsertht|pdfinfoomitdate|pdfinfo|pdfinclusionerrorlevel|pdfinclusioncopyfonts|pdfincludechars|pdfimageresolution|pdfimagehicolor|pdfimagegamma|pdfimageapplygamma|pdfimageaddfilename|pdfignoreunknownimages|pdfignoreddimen|pdfhorigin|pdfglyphtounicode|pdfgentounicode|pdfgamma|pdffontsize|pdffontobjnum|pdffontname|pdffontexpand|pdffontattr|pdffirstlineheight|pdfendthread|pdfendlink|pdfeachlineheight|pdfeachlinedepth|pdfdraftmode|pdfdestmargin|pdfdest|pdfdecimaldigits|pdfcreationdate|pdfcopyfont|pdfcompresslevel|pdfcolorstackinit|pdfcolorstack|pdfcatalog|pdfannot|pdfadjustspacing|pausing|patterns|parskip|parshapelength|parshapeindent|parshapedimen|parshape|parindent|parfillskip|pardirection|parattr|parametercount|par|pagetotal|pagestretch|pageshrink|pagegoal|pagefilstretch|pagefillstretch|pagefilllstretch|pagediscards|pagedepth|overwithdelims|overshoot|overloadmode|overloaded|overline|overfullrule|over|outputpenalty|outputbox|output|outer|orunless|orelse|ordlimits|or|omit|numexpr|number|nullfont|nulldelimiterspace|novrule|nospaces|normalyear|normalxtokspre|normalxtoksapp|normalxspaceskip|normalxleaders|normalxdefcsname|normalxdef|normalwrapuppar|normalwordboundary|normalwidowpenalty|normalwidowpenalties|normalwd|normalvtop|normalvss|normalvsplit|normalvskip|normalvsize|normalvrule|normalvpack|normalvfuzz|normalvfilneg|normalvfill|normalvfil|normalvcenter|normalvbox|normalvbadness|normalvalign|normalvadjust|normaluppercase|normalunvpack|normalunvcopy|normalunvbox|normalunskip|normalunpenalty|normalunletprotected|normalunletfrozen|normalunless|normalunkern|normalunhpack|normalunhcopy|normalunhbox|normalunexpanded|normalunderline|normalundent|normaluchyph|normaluccode|normaltracingstats|normaltracingrestores|normaltracingparagraphs|normaltracingpages|normaltracingoutput|normaltracingonline|normaltracingnesting|normaltracingmath|normaltracingmacros|normaltracinglostchars|normaltracingifs|normaltracinggroups|normaltracingfonts|normaltracingcommands|normaltracingassigns|normaltracingalignments|normaltpack|normaltoscaled|normaltopskip|normaltopmarks|normaltopmark|normaltolerant|normaltolerance|normaltokspre|normaltoksdef|normaltoksapp|normaltoks|normaltokenized|normaltointeger|normaltodimension|normaltime|normalthinmuskip|normalthickmuskip|normalthewithoutunit|normalthe|normaltextstyle|normaltextfont|normaltextdirection|normaltabskip|normalswapcsvalues|normalsupmarkmode|normalstring|normalsplittopskip|normalsplitmaxdepth|normalsplitfirstmarks|normalsplitfirstmark|normalsplitdiscards|normalsplitbotmarks|normalsplitbotmark|normalspan|normalspaceskip|normalspacefactor|normalsnapshotpar|normalskipdef|normalskip|normalskewchar|normalshowtokens|normalshowthe|normalshownodedetails|normalshowlists|normalshowifs|normalshowgroups|normalshowboxdepth|normalshowboxbreadth|normalshowbox|normalshow|normalshipout|normalsfcode|normalsetlanguage|normalsetfontid|normalsetbox|normalscrollmode|normalscriptstyle|normalscriptspace|normalscriptscriptstyle|normalscriptscriptfont|normalscriptfont|normalscantokens|normalscantextokens|normalsavingvdiscards|normalsavinghyphcodes|normalsavecatcodetable|normalrpcode|normalromannumeral|normalrightskip|normalrightmarginkern|normalrighthyphenmin|normalright|normalrelpenalty|normalrelax|normalraise|normalradical|normalquitvmode|normalpxdimen|normalprotrusionboundary|normalprotrudechars|normalprotected|normalprevgraf|normalprevdepth|normalpretolerance|normalprerelpenalty|normalprehyphenchar|normalpreexhyphenchar|normalpredisplaysize|normalpredisplaypenalty|normalpredisplaygapfactor|normalpredisplaydirection|normalprebinoppenalty|normalposthyphenchar|normalpostexhyphenchar|normalpostdisplaypenalty|normalpermanent|normalpenalty|normalpdfximage|normalpdfxformresources|normalpdfxformname|normalpdfxformmargin|normalpdfxformattr|normalpdfxform|normalpdfvorigin|normalpdfuniqueresname|normalpdfuniformdeviate|normalpdftrailerid|normalpdftrailer|normalpdftracingfonts|normalpdfthreadmargin|normalpdfthread|normalpdftexversion|normalpdftexrevision|normalpdftexbanner|normalpdfsuppressptexinfo|normalpdfsuppressoptionalinfo|normalpdfstartthread|normalpdfstartlink|normalpdfsetrandomseed|normalpdfsetmatrix|normalpdfsavepos|normalpdfsave|normalpdfretval|normalpdfrestore|normalpdfreplacefont|normalpdfrefximage|normalpdfrefxform|normalpdfrefobj|normalpdfrecompress|normalpdfrandomseed|normalpdfpxdimen|normalpdfprotrudechars|normalpdfprimitive|normalpdfpkresolution|normalpdfpkmode|normalpdfpkfixeddpi|normalpdfpagewidth|normalpdfpagesattr|normalpdfpageresources|normalpdfpageref|normalpdfpageheight|normalpdfpagebox|normalpdfpageattr|normalpdfoutput|normalpdfoutline|normalpdfomitcidset|normalpdfomitcharset|normalpdfobjcompresslevel|normalpdfobj|normalpdfnormaldeviate|normalpdfnoligatures|normalpdfnames|normalpdfminorversion|normalpdfmapline|normalpdfmapfile|normalpdfmajorversion|normalpdfliteral|normalpdflinkmargin|normalpdflastypos|normalpdflastxpos|normalpdflastximagepages|normalpdflastximage|normalpdflastxform|normalpdflastobj|normalpdflastlink|normalpdflastlinedepth|normalpdflastannot|normalpdfinsertht|normalpdfinfoomitdate|normalpdfinfo|normalpdfinclusionerrorlevel|normalpdfinclusioncopyfonts|normalpdfincludechars|normalpdfimageresolution|normalpdfimagehicolor|normalpdfimagegamma|normalpdfimageapplygamma|normalpdfimageaddfilename|normalpdfignoreunknownimages|normalpdfignoreddimen|normalpdfhorigin|normalpdfglyphtounicode|normalpdfgentounicode|normalpdfgamma|normalpdffontsize|normalpdffontobjnum|normalpdffontname|normalpdffontexpand|normalpdffontattr|normalpdffirstlineheight|normalpdfendthread|normalpdfendlink|normalpdfeachlineheight|normalpdfeachlinedepth|normalpdfdraftmode|normalpdfdestmargin|normalpdfdest|normalpdfdecimaldigits|normalpdfcreationdate|normalpdfcopyfont|normalpdfcompresslevel|normalpdfcolorstackinit|normalpdfcolorstack|normalpdfcatalog|normalpdfannot|normalpdfadjustspacing|normalpausing|normalpatterns|normalparskip|normalparshapelength|normalparshapeindent|normalparshapedimen|normalparshape|normalparindent|normalparfillskip|normalparfillleftskip|normalpardirection|normalparattr|normalparametercount|normalpar|normalpagetotal|normalpagestretch|normalpageshrink|normalpagegoal|normalpagefilstretch|normalpagefillstretch|normalpagefilllstretch|normalpagediscards|normalpagedepth|normaloverwithdelims|normalovershoot|normaloverloadmode|normaloverloaded|normaloverline|normaloverfullrule|normalover|normaloutputpenalty|normaloutputbox|normaloutput|normalouter|normalorunless|normalorelse|normalordlimits|normalor|normalomit|normalnumexpr|normalnumber|normalnullfont|normalnulldelimiterspace|normalnovrule|normalnospaces|normalnormalizelinemode|normalnonstopmode|normalnonscript|normalnolimits|normalnoindent|normalnohrule|normalnoexpand|normalnoboundary|normalnoaligned|normalnoalign|normalnewlinechar|normalmutoglue|normalmutable|normalmuskipdef|normalmuskip|normalmultiply|normalmugluespecdef|normalmuexpr|normalmskip|normalmoveright|normalmoveleft|normalmonth|normalmkern|normalmiddle|normalmessage|normalmedmuskip|normalmeaningless|normalmeaningfull|normalmeaning|normalmaxdepth|normalmaxdeadcycles|normalmathsurroundskip|normalmathsurroundmode|normalmathsurround|normalmathstyle|normalmathscriptsmode|normalmathscriptcharmode|normalmathscriptboxmode|normalmathrulethicknessmode|normalmathrulesmode|normalmathrulesfam|normalmathrel|normalmathpunct|normalmathpenaltiesmode|normalmathord|normalmathopen|normalmathop|normalmatholdmode|normalmathnolimitsmode|normalmathitalicsmode|normalmathinner|normalmathflattenmode|normalmatheqnogapstep|normalmathdisplayskipmode|normalmathdirection|normalmathdelimitersmode|normalmathcode|normalmathclose|normalmathchoice|normalmathchardef|normalmathchar|normalmathbin|normalmathaccent|normalmarks|normalmark|normalluatexversion|normalluatexrevision|normalluatexbanner|normalluafunctioncall|normalluafunction|normalluaescapestring|normalluadef|normalluacopyinputnodes|normalluabytecodecall|normalluabytecode|normallpcode|normallowercase|normallower|normallooseness|normallong|normallocalrightbox|normallocalleftbox|normallocalinterlinepenalty|normallocalcontrolled|normallocalcontrol|normallocalbrokenpenalty|normallistcallbackmode|normallineskiplimit|normallineskip|normallinepenalty|normallinepar|normallinedirection|normallimits|normalletprotected|normalletfrozen|normalletcsname|normalletcharcode|normallet|normalleqno|normalleftskip|normalleftmarginkern|normallefthyphenmin|normalleft|normalleaders|normallccode|normallastskip|normallastpenalty|normallastnodetype|normallastnodesubtype|normallastnamedcs|normallastlinefit|normallastkern|normallastbox|normallastarguments|normallanguage|normalkern|normaljobname|normalizelinemode|normalinterlinepenalty|normalinterlinepenalties|normalinteractionmode|normalintegerdef|normalinstance|normalinsertpenalties|normalinsertht|normalinsertheights|normalinsert|normalinputlineno|normalinput|normalinitcatcodetable|normalindent|normalimmutable|normalimmediate|normalignorespaces|normalignorepars|normalignorearguments|normalifx|normalifvoid|normalifvmode|normalifvbox|normaliftrue|normaliftok|normalifrelax|normalifpdfprimitive|normalifpdfabsnum|normalifpdfabsdim|normalifparameters|normalifparameter|normalifodd|normalifnumval|normalifnum|normalifmmode|normalifmathstyle|normalifmathparameter|normalifinner|normalifincsname|normalifhmode|normalifhbox|normalifhasxtoks|normalifhastoks|normalifhastok|normaliffontchar|normalifflags|normaliffalse|normalifempty|normalifdimval|normalifdim|normalifdefined|normalifcstok|normalifcsname|normalifcondition|normalifcmpnum|normalifcmpdim|normalifchknum|normalifchkdim|normalifcat|normalifcase|normalifboolean|normalifarguments|normalifabsnum|normalifabsdim|normalif|normalhyphenpenalty|normalhyphenchar|normalhyphenationmode|normalhyphenationmin|normalhyphenation|normalht|normalhss|normalhskip|normalhsize|normalhrule|normalhpack|normalholdinginserts|normalhjcode|normalhfuzz|normalhfilneg|normalhfill|normalhfil|normalhbox|normalhbadness|normalhangindent|normalhangafter|normalhalign|normalgtokspre|normalgtoksapp|normalglyphstatefield|normalglyphscriptfield|normalglyphoptions|normalglyphdimensionsmode|normalglyphdatafield|normalgluetomu|normalgluestretchorder|normalgluestretch|normalgluespecdef|normalglueshrinkorder|normalglueshrink|normalglueexpr|normalglobaldefs|normalglobal|normalgletcsname|normalglet|normalgleaders|normalgdefcsname|normalgdef|normalfuturelet|normalfutureexpandisap|normalfutureexpandis|normalfutureexpand|normalfuturedef|normalfrozen|normalformatname|normalfontspecifiedsize|normalfontspecifiedname|normalfontname|normalfontid|normalfontdimen|normalfontcharwd|normalfontcharic|normalfontcharht|normalfontchardp|normalfont|normalfloatingpenalty|normalfirstvalidlanguage|normalfirstmarks|normalfirstmark|normalfinalhyphendemerits|normalfi|normalfam|normalexplicithyphenpenalty|normalexplicitdiscretionary|normalexpandtoken|normalexpanded|normalexpandcstoken|normalexpandafterspaces|normalexpandafterpars|normalexpandafter|normalexpand|normalexhyphenpenalty|normalexhyphenchar|normalexceptionpenalty|normaleveryvbox|normaleverytab|normaleverypar|normaleverymath|normaleveryjob|normaleveryhbox|normaleveryeof|normaleverydisplay|normaleverycr|normaletokspre|normaletoksapp|normalescapechar|normalerrorstopmode|normalerrorcontextlines|normalerrmessage|normalerrhelp|normaleqno|normalenforced|normalendlocalcontrol|normalendlinechar|normalendinput|normalendgroup|normalendcsname|normalend|normalemergencystretch|normalelse|normalefcode|normaledefcsname|normaledef|normaldump|normaldp|normaldoublehyphendemerits|normaldivide|normaldisplaywidth|normaldisplaywidowpenalty|normaldisplaywidowpenalties|normaldisplaystyle|normaldisplaylimits|normaldisplayindent|normaldiscretionary|normaldirectlua|normaldimexpr|normaldimensiondef|normaldimendef|normaldimen|normaldetokenize|normaldelimitershortfall|normaldelimiterfactor|normaldelimiter|normaldelcode|normaldefcsname|normaldefaultskewchar|normaldefaulthyphenchar|normaldef|normaldeadcycles|normalday|normalcurrentiftype|normalcurrentiflevel|normalcurrentifbranch|normalcurrentgrouptype|normalcurrentgrouplevel|normalcsstring|normalcsname|normalcrcr|normalcrampedtextstyle|normalcrampedscriptstyle|normalcrampedscriptscriptstyle|normalcrampeddisplaystyle|normalcr|normalcountdef|normalcount|normalcopy|normalclubpenalty|normalclubpenalties|normalclearmarks|normalcleaders|normalchardef|normalchar|normalcatcodetable|normalcatcode|normalbrokenpenalty|normalboxyoffset|normalboxymove|normalboxxoffset|normalboxxmove|normalboxtotal|normalboxorientation|normalboxmaxdepth|normalboxdirection|normalboxattribute|normalbox|normalboundary|normalbotmarks|normalbotmark|normalbinoppenalty|normalbelowdisplayskip|normalbelowdisplayshortskip|normalbeginlocalcontrol|normalbegingroup|normalbegincsname|normalbatchmode|normalbaselineskip|normalbadness|normalautomigrationmode|normalautomatichyphenpenalty|normalautomaticdiscretionary|normalattributedef|normalattribute|normalatopwithdelims|normalatop|normalatendofgrouped|normalatendofgroup|normalaligntab|normalalignmark|normalaliased|normalaftergrouped|normalaftergroup|normalafterassignment|normalafterassigned|normaladvance|normaladjustspacingstretch|normaladjustspacingstep|normaladjustspacingshrink|normaladjustspacing|normaladjdemerits|normalaccent|normalabovewithdelims|normalabovedisplayskip|normalabovedisplayshortskip|normalabove|normalXeTeXversion|normalUvextensible|normalUunderdelimiter|normalUsuperscript|normalUsuperprescript|normalUsubscript|normalUsubprescript|normalUstyle|normalUstopmath|normalUstopdisplaymath|normalUstartmath|normalUstartdisplaymath|normalUstack|normalUskewedwithdelims|normalUskewed|normalUroot|normalUright|normalUradical|normalUoverwithdelims|normalUoverdelimiter|normalUover|normalUnosuperscript|normalUnosuperprescript|normalUnosubscript|normalUnosubprescript|normalUmiddle|normalUmathunderdelimitervgap|normalUmathunderdelimiterbgap|normalUmathunderbarvgap|normalUmathunderbarrule|normalUmathunderbarkern|normalUmathsupsubbottommax|normalUmathsupshiftup|normalUmathsupshiftdrop|normalUmathsupbottommin|normalUmathsubtopmax|normalUmathsubsupvgap|normalUmathsubsupshiftdown|normalUmathsubshiftdrop|normalUmathsubshiftdown|normalUmathstackvgap|normalUmathstacknumup|normalUmathstackdenomdown|normalUmathspacingmode|normalUmathspacebeforescript|normalUmathspaceafterscript|normalUmathskewedfractionvgap|normalUmathskewedfractionhgap|normalUmathrelrelspacing|normalUmathrelpunctspacing|normalUmathrelordspacing|normalUmathrelopspacing|normalUmathrelopenspacing|normalUmathrelinnerspacing|normalUmathrelclosespacing|normalUmathrelbinspacing|normalUmathradicalvgap|normalUmathradicalrule|normalUmathradicalkern|normalUmathradicaldegreeraise|normalUmathradicaldegreebefore|normalUmathradicaldegreeafter|normalUmathquad|normalUmathpunctrelspacing|normalUmathpunctpunctspacing|normalUmathpunctordspacing|normalUmathpunctopspacing|normalUmathpunctopenspacing|normalUmathpunctinnerspacing|normalUmathpunctclosespacing|normalUmathpunctbinspacing|normalUmathoverdelimitervgap|normalUmathoverdelimiterbgap|normalUmathoverbarvgap|normalUmathoverbarrule|normalUmathoverbarkern|normalUmathordrelspacing|normalUmathordpunctspacing|normalUmathordordspacing|normalUmathordopspacing|normalUmathordopenspacing|normalUmathordinnerspacing|normalUmathordclosespacing|normalUmathordbinspacing|normalUmathoprelspacing|normalUmathoppunctspacing|normalUmathopordspacing|normalUmathopopspacing|normalUmathopopenspacing|normalUmathopinnerspacing|normalUmathoperatorsize|normalUmathopenrelspacing|normalUmathopenpunctspacing|normalUmathopenordspacing|normalUmathopenopspacing|normalUmathopenopenspacing|normalUmathopeninnerspacing|normalUmathopenclosespacing|normalUmathopenbinspacing|normalUmathopclosespacing|normalUmathopbinspacing|normalUmathnolimitsupfactor|normalUmathnolimitsubfactor|normalUmathlimitbelowvgap|normalUmathlimitbelowkern|normalUmathlimitbelowbgap|normalUmathlimitabovevgap|normalUmathlimitabovekern|normalUmathlimitabovebgap|normalUmathinnerrelspacing|normalUmathinnerpunctspacing|normalUmathinnerordspacing|normalUmathinneropspacing|normalUmathinneropenspacing|normalUmathinnerinnerspacing|normalUmathinnerclosespacing|normalUmathinnerbinspacing|normalUmathfractionrule|normalUmathfractionnumvgap|normalUmathfractionnumup|normalUmathfractiondenomvgap|normalUmathfractiondenomdown|normalUmathfractiondelsize|normalUmathconnectoroverlapmin|normalUmathcodenum|normalUmathcode|normalUmathcloserelspacing|normalUmathclosepunctspacing|normalUmathcloseordspacing|normalUmathcloseopspacing|normalUmathcloseopenspacing|normalUmathcloseinnerspacing|normalUmathcloseclosespacing|normalUmathclosebinspacing|normalUmathclass|normalUmathcharslot|normalUmathcharnumdef|normalUmathcharnum|normalUmathcharfam|normalUmathchardef|normalUmathcharclass|normalUmathchar|normalUmathbinrelspacing|normalUmathbinpunctspacing|normalUmathbinordspacing|normalUmathbinopspacing|normalUmathbinopenspacing|normalUmathbininnerspacing|normalUmathbinclosespacing|normalUmathbinbinspacing|normalUmathaxis|normalUmathaccent|normalUleft|normalUhextensible|normalUdelimiterunder|normalUdelimiterover|normalUdelimiter|normalUdelcodenum|normalUdelcode|normalUchar|normalUatopwithdelims|normalUatop|normalUabovewithdelims|normalUabove|normalUUskewedwithdelims|normalUUskewed|normalOmegaversion|normalOmegarevision|normalOmegaminorversion|normalAlephversion|normalAlephrevision|normalAlephminorversion|normal |nonstopmode|nonscript|nolimits|noindent|nohrule|noexpand|noboundary|noaligned|noalign|newlinechar|mutoglue|mutable|muskipdef|muskip|multiply|mugluespecdef|muexpr|mskip|moveright|moveleft|month|mkern|middle|message|medmuskip|meaningless|meaningfull|meaning|maxdepth|maxdeadcycles|mathsurroundskip|mathsurroundmode|mathsurround|mathstyle|mathscriptsmode|mathscriptcharmode|mathscriptboxmode|mathrulethicknessmode|mathrulesmode|mathrulesfam|mathrel|mathpunct|mathpenaltiesmode|mathord|mathopen|mathop|matholdmode|mathnolimitsmode|mathitalicsmode|mathinner|mathflattenmode|matheqnogapstep|mathdisplayskipmode|mathdirection|mathdelimitersmode|mathcode|mathclose|mathchoice|mathchardef|mathchar|mathbin|mathaccent|marks|mark|luatexversion|luatexrevision|luatexbanner|luafunctioncall|luafunction|luaescapestring|luadef|luacopyinputnodes|luabytecodecall|luabytecode|lpcode|lowercase|lower|looseness|long|localrightbox|localleftbox|localinterlinepenalty|localcontrolled|localcontrol|localbrokenpenalty|listcallbackmode|lineskiplimit|lineskip|linepenalty|linepar|linedirection|limits|letprotected|letfrozen|letcsname|letcharcode|let|leqno|leftskip|leftmarginkern|lefthyphenmin|left|leaders|lccode|lastskip|lastpenalty|lastnodetype|lastnodesubtype|lastnamedcs|lastlinefit|lastkern|lastbox|lastarguments|language|kern|jobname|interlinepenalty|interlinepenalties|interactionmode|integerdef|instance|insertpenalties|insertht|insertheights|insert|inputlineno|input|initcatcodetable|indent|immutable|immediate|ignorespaces|ignorepars|ignorearguments|ifx|ifvoid|ifvmode|ifvbox|iftrue|iftok|ifrelax|ifpdfprimitive|ifpdfabsnum|ifpdfabsdim|ifparameters|ifparameter|ifodd|ifnumval|ifnum|ifmmode|ifmathstyle|ifmathparameter|ifinner|ifincsname|ifhmode|ifhbox|ifhasxtoks|ifhastoks|ifhastok|iffontchar|ifflags|iffalse|ifempty|ifdimval|ifdim|ifdefined|ifcstok|ifcsname|ifcondition|ifcmpnum|ifcmpdim|ifchknum|ifchkdim|ifcat|ifcase|ifboolean|ifarguments|ifabsnum|ifabsdim|if|hyphenpenalty|hyphenchar|hyphenationmode|hyphenationmin|hyphenation|ht|hss|hskip|hsize|hrule|hpack|holdinginserts|hjcode|hfuzz|hfilneg|hfill|hfil|hbox|hbadness|hangindent|hangafter|halign|gtokspre|gtoksapp|glyphstatefield|glyphscriptfield|glyphoptions|glyphdimensionsmode|glyphdatafield|gluetomu|gluestretchorder|gluestretch|gluespecdef|glueshrinkorder|glueshrink|glueexpr|globaldefs|global|gletcsname|gleaders|gdefcsname|gdef|futurelet|futureexpandisap|futureexpandis|futureexpand|futuredef|frozen|formatname|fontspecifiedsize|fontspecifiedname|fontname|fontid|fontdimen|fontcharwd|fontcharic|fontcharht|fontchardp|font|floatingpenalty|firstvalidlanguage|firstmarks|firstmark|finalhyphendemerits|fi|fam|explicithyphenpenalty|explicitdiscretionary|expandtoken|expandcstoken|expandafterspaces|expandafterpars|expandafter|expand|exhyphenpenalty|exhyphenchar|exceptionpenalty|everyvbox|everytab|everypar|everymath|everyjob|everyhbox|everyeof|everydisplay|everycr|etokspre|etoksapp|escapechar|errorstopmode|errorcontextlines|errmessage|errhelp|eqno|enforced|endlocalcontrol|endlinechar|endinput|endgroup|endcsname|end|emergencystretch|else|efcode|edefcsname|edef|dump|dp|doublehyphendemerits|divide|displaywidth|displaywidowpenalty|displaywidowpenalties|displaystyle|displaylimits|displayindent|discretionary|directlua|dimexpr|dimensiondef|dimendef|dimen|detokenize|delimitershortfall|delimiterfactor|delimiter|delcode|defcsname|defaultskewchar|defaulthyphenchar|def|deadcycles|day|currentiftype|currentiflevel|currentifbranch|currentgrouptype|currentgrouplevel|csstring|csname|crcr|crampedtextstyle|crampedscriptstyle|crampedscriptscriptstyle|crampeddisplaystyle|cr|countdef|count|copy|clubpenalty|clubpenalties|clearmarks|cleaders|chardef|char|catcodetable|catcode|brokenpenalty|boxyoffset|boxymove|boxxoffset|boxxmove|boxtotal|boxorientation|boxmaxdepth|boxdirection|boxattribute|box|boundary|botmarks|botmark|binoppenalty|belowdisplayskip|belowdisplayshortskip|beginlocalcontrol|begingroup|begincsname|batchmode|baselineskip|badness|automigrationmode|automatichyphenpenalty|automaticdiscretionary|attributedef|attribute|atopwithdelims|atop|atendofgrouped|atendofgroup|aligntab|alignmark|aliased|aftergrouped|aftergroup|afterassignment|afterassigned|advance|adjustspacingstretch|adjustspacingstep|adjustspacingshrink|adjustspacing|adjdemerits|accent|abovewithdelims|abovedisplayskip|abovedisplayshortskip|above|XeTeXversion|Uvextensible|Uunderdelimiter|Usuperscript|Usuperprescript|Usubscript|Usubprescript|Ustyle|Ustopmath|Ustopdisplaymath|Ustartmath|Ustartdisplaymath|Ustack|Uskewedwithdelims|Uskewed|Uroot|Uright|Uradical|Uoverwithdelims|Uoverdelimiter|Uover|Unosuperscript|Unosuperprescript|Unosubscript|Unosubprescript|Umiddle|Umathunderdelimitervgap|Umathunderdelimiterbgap|Umathunderbarvgap|Umathunderbarrule|Umathunderbarkern|Umathsupsubbottommax|Umathsupshiftup|Umathsupshiftdrop|Umathsupbottommin|Umathsubtopmax|Umathsubsupvgap|Umathsubsupshiftdown|Umathsubshiftdrop|Umathsubshiftdown|Umathstackvgap|Umathstacknumup|Umathstackdenomdown|Umathspacingmode|Umathspacebeforescript|Umathspaceafterscript|Umathskewedfractionvgap|Umathskewedfractionhgap|Umathrelrelspacing|Umathrelpunctspacing|Umathrelordspacing|Umathrelopspacing|Umathrelopenspacing|Umathrelinnerspacing|Umathrelclosespacing|Umathrelbinspacing|Umathradicalvgap|Umathradicalrule|Umathradicalkern|Umathradicaldegreeraise|Umathradicaldegreebefore|Umathradicaldegreeafter|Umathquad|Umathpunctrelspacing|Umathpunctpunctspacing|Umathpunctordspacing|Umathpunctopspacing|Umathpunctopenspacing|Umathpunctinnerspacing|Umathpunctclosespacing|Umathpunctbinspacing|Umathoverdelimitervgap|Umathoverdelimiterbgap|Umathoverbarvgap|Umathoverbarrule|Umathoverbarkern|Umathordrelspacing|Umathordpunctspacing|Umathordordspacing|Umathordopspacing|Umathordopenspacing|Umathordinnerspacing|Umathordclosespacing|Umathordbinspacing|Umathoprelspacing|Umathoppunctspacing|Umathopordspacing|Umathopopspacing|Umathopopenspacing|Umathopinnerspacing|Umathoperatorsize|Umathopenrelspacing|Umathopenpunctspacing|Umathopenordspacing|Umathopenopspacing|Umathopenopenspacing|Umathopeninnerspacing|Umathopenclosespacing|Umathopenbinspacing|Umathopclosespacing|Umathopbinspacing|Umathnolimitsupfactor|Umathnolimitsubfactor|Umathlimitbelowvgap|Umathlimitbelowkern|Umathlimitbelowbgap|Umathlimitabovevgap|Umathlimitabovekern|Umathlimitabovebgap|Umathinnerrelspacing|Umathinnerpunctspacing|Umathinnerordspacing|Umathinneropspacing|Umathinneropenspacing|Umathinnerinnerspacing|Umathinnerclosespacing|Umathinnerbinspacing|Umathfractionrule|Umathfractionnumvgap|Umathfractionnumup|Umathfractiondenomvgap|Umathfractiondenomdown|Umathfractiondelsize|Umathconnectoroverlapmin|Umathcodenum|Umathcode|Umathcloserelspacing|Umathclosepunctspacing|Umathcloseordspacing|Umathcloseopspacing|Umathcloseopenspacing|Umathcloseinnerspacing|Umathcloseclosespacing|Umathclosebinspacing|Umathclass|Umathcharslot|Umathcharnumdef|Umathcharnum|Umathcharfam|Umathchardef|Umathcharclass|Umathchar|Umathbinrelspacing|Umathbinpunctspacing|Umathbinordspacing|Umathbinopspacing|Umathbinopenspacing|Umathbininnerspacing|Umathbinclosespacing|Umathbinbinspacing|Umathaxis|Umathaccent|Uleft|Uhextensible|Udelimiterunder|Udelimiterover|Udelimiter|Udelcodenum|Udelcode|Uchar|Uatopwithdelims|Uatop|Uabovewithdelims|Uabove|UUskewedwithdelims|UUskewed|Omegaversion|Omegarevision|Omegaminorversion|Alephversion|Alephrevision|Alephminorversion| )(?=[^a-zA-Z])",
+   "match" : "\u005C\u005C(year|xtokspre|xtoksapp|xspaceskip|xleaders|xdefcsname|xdef|wrapuppar|wordboundary|widowpenalty|widowpenalties|wd|vtop|vss|vsplit|vskip|vsize|vrule|vpack|vfuzz|vfilneg|vfill|vfil|vcenter|vbox|vbadness|valign|vadjust|uppercase|unvpack|unvcopy|unvbox|unskip|unpenalty|unletprotected|unletfrozen|unless|unkern|unhpack|unhcopy|unhbox|underline|undent|uchyph|uccode|tracingstats|tracingrestores|tracingparagraphs|tracingpages|tracingoutput|tracingonline|tracingnesting|tracingmath|tracingmacros|tracinglostchars|tracingifs|tracinggroups|tracingfonts|tracingcommands|tracingassigns|tracingalignments|tpack|toscaled|topskip|topmarks|topmark|tolerant|tolerance|tokspre|toksdef|toksapp|toks|tokenized|tointeger|todimension|time|thinmuskip|thickmuskip|thewithoutunit|the|textstyle|textfont|textdirection|tabskip|swapcsvalues|supmarkmode|string|splittopskip|splitmaxdepth|splitfirstmarks|splitfirstmark|splitdiscards|splitbotmarks|splitbotmark|span|spaceskip|spacefactor|snapshotpar|skipdef|skip|skewchar|showtokens|showthe|shownodedetails|showlists|showifs|showgroups|showboxdepth|showboxbreadth|showbox|show|shipout|sfcode|setlanguage|setfontid|setbox|scrollmode|scriptstyle|scriptspace|scriptscriptstyle|scriptscriptfont|scriptfont|scantokens|scantextokens|savingvdiscards|savinghyphcodes|savecatcodetable|rpcode|romannumeral|rightskip|rightmarginkern|righthyphenmin|right|relpenalty|relax|raise|radical|quitvmode|pxdimen|protrusionboundary|protrudechars|protected|prevgraf|prevdepth|pretolerance|prerelpenalty|prehyphenchar|preexhyphenchar|predisplaysize|predisplaypenalty|predisplaygapfactor|predisplaydirection|prebinoppenalty|posthyphenchar|postexhyphenchar|postdisplaypenalty|permanent|penalty|pdfximage|pdfxformresources|pdfxformname|pdfxformmargin|pdfxformattr|pdfxform|pdfvorigin|pdfuniqueresname|pdfuniformdeviate|pdftrailerid|pdftrailer|pdftracingfonts|pdfthreadmargin|pdfthread|pdftexversion|pdftexrevision|pdftexbanner|pdfsuppressptexinfo|pdfsuppressoptionalinfo|pdfstartthread|pdfstartlink|pdfsetrandomseed|pdfsetmatrix|pdfsavepos|pdfsave|pdfretval|pdfrestore|pdfreplacefont|pdfrefximage|pdfrefxform|pdfrefobj|pdfrecompress|pdfrandomseed|pdfpxdimen|pdfprotrudechars|pdfprimitive|pdfpkresolution|pdfpkmode|pdfpkfixeddpi|pdfpagewidth|pdfpagesattr|pdfpageresources|pdfpageref|pdfpageheight|pdfpagebox|pdfpageattr|pdfoutput|pdfoutline|pdfomitcidset|pdfomitcharset|pdfobjcompresslevel|pdfobj|pdfnormaldeviate|pdfnoligatures|pdfnames|pdfminorversion|pdfmapline|pdfmapfile|pdfmajorversion|pdfliteral|pdflinkmargin|pdflastypos|pdflastxpos|pdflastximagepages|pdflastximage|pdflastxform|pdflastobj|pdflastlink|pdflastlinedepth|pdflastannot|pdfinsertht|pdfinfoomitdate|pdfinfo|pdfinclusionerrorlevel|pdfinclusioncopyfonts|pdfincludechars|pdfimageresolution|pdfimagehicolor|pdfimagegamma|pdfimageapplygamma|pdfimageaddfilename|pdfignoreunknownimages|pdfignoreddimen|pdfhorigin|pdfglyphtounicode|pdfgentounicode|pdfgamma|pdffontsize|pdffontobjnum|pdffontname|pdffontexpand|pdffontattr|pdffirstlineheight|pdfendthread|pdfendlink|pdfeachlineheight|pdfeachlinedepth|pdfdraftmode|pdfdestmargin|pdfdest|pdfdecimaldigits|pdfcreationdate|pdfcopyfont|pdfcompresslevel|pdfcolorstackinit|pdfcolorstack|pdfcatalog|pdfannot|pdfadjustspacing|pausing|patterns|parskip|parshapelength|parshapeindent|parshapedimen|parshape|parindent|parfillskip|pardirection|parattr|parametercount|par|pagetotal|pagestretch|pageshrink|pagegoal|pagefilstretch|pagefillstretch|pagefilllstretch|pagediscards|pagedepth|overwithdelims|overshoot|overloadmode|overloaded|overline|overfullrule|over|outputpenalty|outputbox|output|outer|orunless|orelse|ordlimits|or|omit|numexpr|number|nullfont|nulldelimiterspace|novrule|nospaces|normalyear|normalxtokspre|normalxtoksapp|normalxspaceskip|normalxleaders|normalxdefcsname|normalxdef|normalwrapuppar|normalwordboundary|normalwidowpenalty|normalwidowpenalties|normalwd|normalvtop|normalvss|normalvsplit|normalvskip|normalvsize|normalvrule|normalvpack|normalvfuzz|normalvfilneg|normalvfill|normalvfil|normalvcenter|normalvbox|normalvbadness|normalvalign|normalvadjust|normaluppercase|normalunvpack|normalunvcopy|normalunvbox|normalunskip|normalunpenalty|normalunletprotected|normalunletfrozen|normalunless|normalunkern|normalunhpack|normalunhcopy|normalunhbox|normalunexpanded|normalunderline|normalundent|normaluchyph|normaluccode|normaltracingstats|normaltracingrestores|normaltracingparagraphs|normaltracingpages|normaltracingoutput|normaltracingonline|normaltracingnesting|normaltracingmath|normaltracingmacros|normaltracinglostchars|normaltracingifs|normaltracinggroups|normaltracingfonts|normaltracingcommands|normaltracingassigns|normaltracingalignments|normaltpack|normaltoscaled|normaltopskip|normaltopmarks|normaltopmark|normaltolerant|normaltolerance|normaltokspre|normaltoksdef|normaltoksapp|normaltoks|normaltokenized|normaltointeger|normaltodimension|normaltime|normalthinmuskip|normalthickmuskip|normalthewithoutunit|normalthe|normaltextstyle|normaltextfont|normaltextdirection|normaltabskip|normalswapcsvalues|normalsupmarkmode|normalstring|normalsplittopskip|normalsplitmaxdepth|normalsplitfirstmarks|normalsplitfirstmark|normalsplitdiscards|normalsplitbotmarks|normalsplitbotmark|normalspan|normalspaceskip|normalspacefactor|normalsnapshotpar|normalskipdef|normalskip|normalskewchar|normalshowtokens|normalshowthe|normalshownodedetails|normalshowlists|normalshowifs|normalshowgroups|normalshowboxdepth|normalshowboxbreadth|normalshowbox|normalshow|normalshipout|normalsfcode|normalsetlanguage|normalsetfontid|normalsetbox|normalscrollmode|normalscriptstyle|normalscriptspace|normalscriptscriptstyle|normalscriptscriptfont|normalscriptfont|normalscantokens|normalscantextokens|normalsavingvdiscards|normalsavinghyphcodes|normalsavecatcodetable|normalrpcode|normalromannumeral|normalrightskip|normalrightmarginkern|normalrighthyphenmin|normalright|normalrelpenalty|normalrelax|normalraise|normalradical|normalquitvmode|normalpxdimen|normalprotrusionboundary|normalprotrudechars|normalprotected|normalprevgraf|normalprevdepth|normalpretolerance|normalprerelpenalty|normalprehyphenchar|normalpreexhyphenchar|normalpredisplaysize|normalpredisplaypenalty|normalpredisplaygapfactor|normalpredisplaydirection|normalprebinoppenalty|normalposthyphenchar|normalpostexhyphenchar|normalpostdisplaypenalty|normalpermanent|normalpenalty|normalpdfximage|normalpdfxformresources|normalpdfxformname|normalpdfxformmargin|normalpdfxformattr|normalpdfxform|normalpdfvorigin|normalpdfuniqueresname|normalpdfuniformdeviate|normalpdftrailerid|normalpdftrailer|normalpdftracingfonts|normalpdfthreadmargin|normalpdfthread|normalpdftexversion|normalpdftexrevision|normalpdftexbanner|normalpdfsuppressptexinfo|normalpdfsuppressoptionalinfo|normalpdfstartthread|normalpdfstartlink|normalpdfsetrandomseed|normalpdfsetmatrix|normalpdfsavepos|normalpdfsave|normalpdfretval|normalpdfrestore|normalpdfreplacefont|normalpdfrefximage|normalpdfrefxform|normalpdfrefobj|normalpdfrecompress|normalpdfrandomseed|normalpdfpxdimen|normalpdfprotrudechars|normalpdfprimitive|normalpdfpkresolution|normalpdfpkmode|normalpdfpkfixeddpi|normalpdfpagewidth|normalpdfpagesattr|normalpdfpageresources|normalpdfpageref|normalpdfpageheight|normalpdfpagebox|normalpdfpageattr|normalpdfoutput|normalpdfoutline|normalpdfomitcidset|normalpdfomitcharset|normalpdfobjcompresslevel|normalpdfobj|normalpdfnormaldeviate|normalpdfnoligatures|normalpdfnames|normalpdfminorversion|normalpdfmapline|normalpdfmapfile|normalpdfmajorversion|normalpdfliteral|normalpdflinkmargin|normalpdflastypos|normalpdflastxpos|normalpdflastximagepages|normalpdflastximage|normalpdflastxform|normalpdflastobj|normalpdflastlink|normalpdflastlinedepth|normalpdflastannot|normalpdfinsertht|normalpdfinfoomitdate|normalpdfinfo|normalpdfinclusionerrorlevel|normalpdfinclusioncopyfonts|normalpdfincludechars|normalpdfimageresolution|normalpdfimagehicolor|normalpdfimagegamma|normalpdfimageapplygamma|normalpdfimageaddfilename|normalpdfignoreunknownimages|normalpdfignoreddimen|normalpdfhorigin|normalpdfglyphtounicode|normalpdfgentounicode|normalpdfgamma|normalpdffontsize|normalpdffontobjnum|normalpdffontname|normalpdffontexpand|normalpdffontattr|normalpdffirstlineheight|normalpdfendthread|normalpdfendlink|normalpdfeachlineheight|normalpdfeachlinedepth|normalpdfdraftmode|normalpdfdestmargin|normalpdfdest|normalpdfdecimaldigits|normalpdfcreationdate|normalpdfcopyfont|normalpdfcompresslevel|normalpdfcolorstackinit|normalpdfcolorstack|normalpdfcatalog|normalpdfannot|normalpdfadjustspacing|normalpausing|normalpatterns|normalparskip|normalparshapelength|normalparshapeindent|normalparshapedimen|normalparshape|normalparindent|normalparfillskip|normalparfillleftskip|normalpardirection|normalparattr|normalparametercount|normalpar|normalpagetotal|normalpagestretch|normalpageshrink|normalpagegoal|normalpagefilstretch|normalpagefillstretch|normalpagefilllstretch|normalpagediscards|normalpagedepth|normaloverwithdelims|normalovershoot|normaloverloadmode|normaloverloaded|normaloverline|normaloverfullrule|normalover|normaloutputpenalty|normaloutputbox|normaloutput|normalouter|normalorunless|normalorelse|normalordlimits|normalor|normalomit|normalnumexpr|normalnumber|normalnullfont|normalnulldelimiterspace|normalnovrule|normalnospaces|normalnormalizelinemode|normalnonstopmode|normalnonscript|normalnolimits|normalnoindent|normalnohrule|normalnoexpand|normalnoboundary|normalnoaligned|normalnoalign|normalnewlinechar|normalmutoglue|normalmutable|normalmuskipdef|normalmuskip|normalmultiply|normalmugluespecdef|normalmuexpr|normalmskip|normalmoveright|normalmoveleft|normalmonth|normalmkern|normalmiddle|normalmessage|normalmedmuskip|normalmeaningless|normalmeaningfull|normalmeaning|normalmaxdepth|normalmaxdeadcycles|normalmathsurroundskip|normalmathsurroundmode|normalmathsurround|normalmathstyle|normalmathscriptsmode|normalmathscriptcharmode|normalmathscriptboxmode|normalmathrulethicknessmode|normalmathrulesmode|normalmathrulesfam|normalmathrel|normalmathpunct|normalmathpenaltiesmode|normalmathord|normalmathopen|normalmathop|normalmatholdmode|normalmathnolimitsmode|normalmathitalicsmode|normalmathinner|normalmathflattenmode|normalmatheqnogapstep|normalmathdisplayskipmode|normalmathdirection|normalmathdelimitersmode|normalmathcode|normalmathclose|normalmathchoice|normalmathchardef|normalmathchar|normalmathbin|normalmathaccent|normalmarks|normalmark|normalluatexversion|normalluatexrevision|normalluatexbanner|normalluafunctioncall|normalluafunction|normalluaescapestring|normalluadef|normalluacopyinputnodes|normalluabytecodecall|normalluabytecode|normallpcode|normallowercase|normallower|normallooseness|normallong|normallocalrightbox|normallocalleftbox|normallocalinterlinepenalty|normallocalcontrolled|normallocalcontrol|normallocalbrokenpenalty|normallistcallbackmode|normallineskiplimit|normallineskip|normallinepenalty|normallinepar|normallinedirection|normallimits|normalletprotected|normalletfrozen|normalletcsname|normalletcharcode|normallet|normalleqno|normalleftskip|normalleftmarginkern|normallefthyphenmin|normalleft|normalleaders|normallccode|normallastskip|normallastpenalty|normallastnodetype|normallastnodesubtype|normallastnamedcs|normallastlinefit|normallastkern|normallastbox|normallastarguments|normallanguage|normalkern|normaljobname|normalizelinemode|normalinterlinepenalty|normalinterlinepenalties|normalinteractionmode|normalintegerdef|normalinstance|normalinsertpenalties|normalinsertht|normalinsertheights|normalinsert|normalinputlineno|normalinput|normalinitcatcodetable|normalindent|normalimmutable|normalimmediate|normalignorespaces|normalignorepars|normalignorearguments|normalifx|normalifvoid|normalifvmode|normalifvbox|normaliftrue|normaliftok|normalifrelax|normalifpdfprimitive|normalifpdfabsnum|normalifpdfabsdim|normalifparameters|normalifparameter|normalifodd|normalifnumval|normalifnum|normalifmmode|normalifmathstyle|normalifmathparameter|normalifinner|normalifincsname|normalifhmode|normalifhbox|normalifhasxtoks|normalifhastoks|normalifhastok|normaliffontchar|normalifflags|normaliffalse|normalifempty|normalifdimval|normalifdim|normalifdefined|normalifcstok|normalifcsname|normalifcondition|normalifcmpnum|normalifcmpdim|normalifchknum|normalifchkdim|normalifcat|normalifcase|normalifboolean|normalifarguments|normalifabsnum|normalifabsdim|normalif|normalhyphenpenalty|normalhyphenchar|normalhyphenationmode|normalhyphenationmin|normalhyphenation|normalht|normalhss|normalhskip|normalhsize|normalhrule|normalhpack|normalholdinginserts|normalhjcode|normalhfuzz|normalhfilneg|normalhfill|normalhfil|normalhbox|normalhbadness|normalhangindent|normalhangafter|normalhalign|normalgtokspre|normalgtoksapp|normalglyphstatefield|normalglyphscriptfield|normalglyphoptions|normalglyphdimensionsmode|normalglyphdatafield|normalgluetomu|normalgluestretchorder|normalgluestretch|normalgluespecdef|normalglueshrinkorder|normalglueshrink|normalglueexpr|normalglobaldefs|normalglobal|normalgletcsname|normalglet|normalgleaders|normalgdefcsname|normalgdef|normalfuturelet|normalfutureexpandisap|normalfutureexpandis|normalfutureexpand|normalfuturedef|normalfrozen|normalformatname|normalfontspecifiedsize|normalfontspecifiedname|normalfontname|normalfontid|normalfontdimen|normalfontcharwd|normalfontcharic|normalfontcharht|normalfontchardp|normalfont|normalfloatingpenalty|normalfirstvalidlanguage|normalfirstmarks|normalfirstmark|normalfinalhyphendemerits|normalfi|normalfam|normalexplicithyphenpenalty|normalexplicitdiscretionary|normalexpandtoken|normalexpanded|normalexpandcstoken|normalexpandafterspaces|normalexpandafterpars|normalexpandafter|normalexpand|normalexhyphenpenalty|normalexhyphenchar|normalexceptionpenalty|normaleveryvbox|normaleverytab|normaleverypar|normaleverymath|normaleveryjob|normaleveryhbox|normaleveryeof|normaleverydisplay|normaleverycr|normaletokspre|normaletoksapp|normalescapechar|normalerrorstopmode|normalerrorcontextlines|normalerrmessage|normalerrhelp|normaleqno|normalenforced|normalendlocalcontrol|normalendlinechar|normalendinput|normalendgroup|normalendcsname|normalend|normalemergencystretch|normalelse|normalefcode|normaledefcsname|normaledef|normaldump|normaldp|normaldoublehyphendemerits|normaldivide|normaldisplaywidth|normaldisplaywidowpenalty|normaldisplaywidowpenalties|normaldisplaystyle|normaldisplaylimits|normaldisplayindent|normaldiscretionary|normaldirectlua|normaldimexpr|normaldimensiondef|normaldimendef|normaldimen|normaldetokenize|normaldelimitershortfall|normaldelimiterfactor|normaldelimiter|normaldelcode|normaldefcsname|normaldefaultskewchar|normaldefaulthyphenchar|normaldef|normaldeadcycles|normalday|normalcurrentiftype|normalcurrentiflevel|normalcurrentifbranch|normalcurrentgrouptype|normalcurrentgrouplevel|normalcsstring|normalcsname|normalcrcr|normalcrampedtextstyle|normalcrampedscriptstyle|normalcrampedscriptscriptstyle|normalcrampeddisplaystyle|normalcr|normalcountdef|normalcount|normalcopy|normalclubpenalty|normalclubpenalties|normalclearmarks|normalcleaders|normalchardef|normalchar|normalcatcodetable|normalcatcode|normalbrokenpenalty|normalboxyoffset|normalboxymove|normalboxxoffset|normalboxxmove|normalboxtotal|normalboxorientation|normalboxmaxdepth|normalboxdirection|normalboxattribute|normalbox|normalboundary|normalbotmarks|normalbotmark|normalbinoppenalty|normalbelowdisplayskip|normalbelowdisplayshortskip|normalbeginlocalcontrol|normalbegingroup|normalbegincsname|normalbatchmode|normalbaselineskip|normalbadness|normalautomigrationmode|normalautomatichyphenpenalty|normalautomaticdiscretionary|normalattributedef|normalattribute|normalatopwithdelims|normalatop|normalatendofgrouped|normalatendofgroup|normalaligntab|normalalignmark|normalaliased|normalaftergrouped|normalaftergroup|normalafterassignment|normalafterassigned|normaladvance|normaladjustspacingstretch|normaladjustspacingstep|normaladjustspacingshrink|normaladjustspacing|normaladjdemerits|normalaccent|normalabovewithdelims|normalabovedisplayskip|normalabovedisplayshortskip|normalabove|normalXeTeXversion|normalUvextensible|normalUunderdelimiter|normalUsuperscript|normalUsuperprescript|normalUsubscript|normalUsubprescript|normalUstyle|normalUstopmath|normalUstopdisplaymath|normalUstartmath|normalUstartdisplaymath|normalUstack|normalUskewedwithdelims|normalUskewed|normalUroot|normalUright|normalUradical|normalUoverwithdelims|normalUoverdelimiter|normalUover|normalUnosuperscript|normalUnosuperprescript|normalUnosubscript|normalUnosubprescript|normalUmiddle|normalUmathunderdelimitervgap|normalUmathunderdelimiterbgap|normalUmathunderbarvgap|normalUmathunderbarrule|normalUmathunderbarkern|normalUmathsupsubbottommax|normalUmathsupshiftup|normalUmathsupshiftdrop|normalUmathsupbottommin|normalUmathsubtopmax|normalUmathsubsupvgap|normalUmathsubsupshiftdown|normalUmathsubshiftdrop|normalUmathsubshiftdown|normalUmathstackvgap|normalUmathstacknumup|normalUmathstackdenomdown|normalUmathspacingmode|normalUmathspacebeforescript|normalUmathspaceafterscript|normalUmathskewedfractionvgap|normalUmathskewedfractionhgap|normalUmathrelrelspacing|normalUmathrelpunctspacing|normalUmathrelordspacing|normalUmathrelopspacing|normalUmathrelopenspacing|normalUmathrelinnerspacing|normalUmathrelclosespacing|normalUmathrelbinspacing|normalUmathradicalvgap|normalUmathradicalrule|normalUmathradicalkern|normalUmathradicaldegreeraise|normalUmathradicaldegreebefore|normalUmathradicaldegreeafter|normalUmathquad|normalUmathpunctrelspacing|normalUmathpunctpunctspacing|normalUmathpunctordspacing|normalUmathpunctopspacing|normalUmathpunctopenspacing|normalUmathpunctinnerspacing|normalUmathpunctclosespacing|normalUmathpunctbinspacing|normalUmathoverdelimitervgap|normalUmathoverdelimiterbgap|normalUmathoverbarvgap|normalUmathoverbarrule|normalUmathoverbarkern|normalUmathordrelspacing|normalUmathordpunctspacing|normalUmathordordspacing|normalUmathordopspacing|normalUmathordopenspacing|normalUmathordinnerspacing|normalUmathordclosespacing|normalUmathordbinspacing|normalUmathoprelspacing|normalUmathoppunctspacing|normalUmathopordspacing|normalUmathopopspacing|normalUmathopopenspacing|normalUmathopinnerspacing|normalUmathoperatorsize|normalUmathopenrelspacing|normalUmathopenpunctspacing|normalUmathopenordspacing|normalUmathopenopspacing|normalUmathopenopenspacing|normalUmathopeninnerspacing|normalUmathopenclosespacing|normalUmathopenbinspacing|normalUmathopclosespacing|normalUmathopbinspacing|normalUmathnolimitsupfactor|normalUmathnolimitsubfactor|normalUmathlimitbelowvgap|normalUmathlimitbelowkern|normalUmathlimitbelowbgap|normalUmathlimitabovevgap|normalUmathlimitabovekern|normalUmathlimitabovebgap|normalUmathinnerrelspacing|normalUmathinnerpunctspacing|normalUmathinnerordspacing|normalUmathinneropspacing|normalUmathinneropenspacing|normalUmathinnerinnerspacing|normalUmathinnerclosespacing|normalUmathinnerbinspacing|normalUmathfractionrule|normalUmathfractionnumvgap|normalUmathfractionnumup|normalUmathfractiondenomvgap|normalUmathfractiondenomdown|normalUmathfractiondelsize|normalUmathconnectoroverlapmin|normalUmathcodenum|normalUmathcode|normalUmathcloserelspacing|normalUmathclosepunctspacing|normalUmathcloseordspacing|normalUmathcloseopspacing|normalUmathcloseopenspacing|normalUmathcloseinnerspacing|normalUmathcloseclosespacing|normalUmathclosebinspacing|normalUmathclass|normalUmathcharslot|normalUmathcharnumdef|normalUmathcharnum|normalUmathcharfam|normalUmathchardef|normalUmathcharclass|normalUmathchar|normalUmathbinrelspacing|normalUmathbinpunctspacing|normalUmathbinordspacing|normalUmathbinopspacing|normalUmathbinopenspacing|normalUmathbininnerspacing|normalUmathbinclosespacing|normalUmathbinbinspacing|normalUmathaxis|normalUmathaccent|normalUleft|normalUhextensible|normalUdelimiterunder|normalUdelimiterover|normalUdelimiter|normalUdelcodenum|normalUdelcode|normalUchar|normalUatopwithdelims|normalUatop|normalUabovewithdelims|normalUabove|normalUUskewedwithdelims|normalUUskewed|normalOmegaversion|normalOmegarevision|normalOmegaminorversion|normalAlephversion|normalAlephrevision|normalAlephminorversion|normal |nonstopmode|nonscript|nolimits|noindent|nohrule|noexpand|noboundary|noaligned|noalign|newlinechar|mutoglue|mutable|muskipdef|muskip|multiply|mugluespecdef|muexpr|mskip|moveright|moveleft|month|mkern|middle|message|medmuskip|meaningless|meaningfull|meaning|maxdepth|maxdeadcycles|mathsurroundskip|mathsurroundmode|mathsurround|mathstyle|mathscriptsmode|mathscriptcharmode|mathscriptboxmode|mathrulethicknessmode|mathrulesmode|mathrulesfam|mathrel|mathpunct|mathpenaltiesmode|mathord|mathopen|mathop|matholdmode|mathnolimitsmode|mathitalicsmode|mathinner|mathflattenmode|matheqnogapstep|mathdisplayskipmode|mathdirection|mathdelimitersmode|mathcode|mathclose|mathchoice|mathchardef|mathchar|mathbin|mathaccent|marks|mark|luatexversion|luatexrevision|luatexbanner|luafunctioncall|luafunction|luaescapestring|luadef|luacopyinputnodes|luabytecodecall|luabytecode|lpcode|lowercase|lower|looseness|long|localrightbox|localleftbox|localinterlinepenalty|localcontrolled|localcontrol|localbrokenpenalty|listcallbackmode|lineskiplimit|lineskip|linepenalty|linepar|linedirection|limits|letprotected|letfrozen|letcsname|letcharcode|let|leqno|leftskip|leftmarginkern|lefthyphenmin|left|leaders|lccode|lastskip|lastpenalty|lastnodetype|lastnodesubtype|lastnamedcs|lastlinefit|lastkern|lastbox|lastarguments|language|kern|jobname|interlinepenalty|interlinepenalties|interactionmode|integerdef|instance|insertpenalties|insertht|insertheights|insert|inputlineno|input|initcatcodetable|indent|immutable|immediate|ignorespaces|ignorepars|ignorearguments|ifx|ifvoid|ifvmode|ifvbox|iftrue|iftok|ifrelax|ifpdfprimitive|ifpdfabsnum|ifpdfabsdim|ifparameters|ifparameter|ifodd|ifnumval|ifnum|ifmmode|ifmathstyle|ifmathparameter|ifinner|ifincsname|ifhmode|ifhbox|ifhasxtoks|ifhastoks|ifhastok|iffontchar|ifflags|iffalse|ifempty|ifdimval|ifdim|ifdefined|ifcstok|ifcsname|ifcondition|ifcmpnum|ifcmpdim|ifchknum|ifchkdim|ifcat|ifcase|ifboolean|ifarguments|ifabsnum|ifabsdim|if|hyphenpenalty|hyphenchar|hyphenationmode|hyphenationmin|hyphenation|ht|hss|hskip|hsize|hrule|hpack|holdinginserts|hjcode|hfuzz|hfilneg|hfill|hfil|hbox|hbadness|hangindent|hangafter|halign|gtokspre|gtoksapp|glyphstatefield|glyphscriptfield|glyphoptions|glyphdimensionsmode|glyphdatafield|gluetomu|gluestretchorder|gluestretch|gluespecdef|glueshrinkorder|glueshrink|glueexpr|globaldefs|global|gletcsname|glet|gleaders|gdefcsname|gdef|futurelet|futureexpandisap|futureexpandis|futureexpand|futuredef|frozen|formatname|fontspecifiedsize|fontspecifiedname|fontname|fontid|fontdimen|fontcharwd|fontcharic|fontcharht|fontchardp|font|floatingpenalty|firstvalidlanguage|firstmarks|firstmark|finalhyphendemerits|fi|fam|explicithyphenpenalty|explicitdiscretionary|expandtoken|expandcstoken|expandafterspaces|expandafterpars|expandafter|expand|exhyphenpenalty|exhyphenchar|exceptionpenalty|everyvbox|everytab|everypar|everymath|everyjob|everyhbox|everyeof|everydisplay|everycr|etokspre|etoksapp|escapechar|errorstopmode|errorcontextlines|errmessage|errhelp|eqno|enforced|endlocalcontrol|endlinechar|endinput|endgroup|endcsname|end|emergencystretch|else|efcode|edefcsname|edef|dump|dp|doublehyphendemerits|divide|displaywidth|displaywidowpenalty|displaywidowpenalties|displaystyle|displaylimits|displayindent|discretionary|directlua|dimexpr|dimensiondef|dimendef|dimen|detokenize|delimitershortfall|delimiterfactor|delimiter|delcode|defcsname|defaultskewchar|defaulthyphenchar|def|deadcycles|day|currentiftype|currentiflevel|currentifbranch|currentgrouptype|currentgrouplevel|csstring|csname|crcr|crampedtextstyle|crampedscriptstyle|crampedscriptscriptstyle|crampeddisplaystyle|cr|countdef|count|copy|clubpenalty|clubpenalties|clearmarks|cleaders|chardef|char|catcodetable|catcode|brokenpenalty|boxyoffset|boxymove|boxxoffset|boxxmove|boxtotal|boxorientation|boxmaxdepth|boxdirection|boxattribute|box|boundary|botmarks|botmark|binoppenalty|belowdisplayskip|belowdisplayshortskip|beginlocalcontrol|begingroup|begincsname|batchmode|baselineskip|badness|automigrationmode|automatichyphenpenalty|automaticdiscretionary|attributedef|attribute|atopwithdelims|atop|atendofgrouped|atendofgroup|aligntab|alignmark|aliased|aftergrouped|aftergroup|afterassignment|afterassigned|advance|adjustspacingstretch|adjustspacingstep|adjustspacingshrink|adjustspacing|adjdemerits|accent|abovewithdelims|abovedisplayskip|abovedisplayshortskip|above|XeTeXversion|Uvextensible|Uunderdelimiter|Usuperscript|Usuperprescript|Usubscript|Usubprescript|Ustyle|Ustopmath|Ustopdisplaymath|Ustartmath|Ustartdisplaymath|Ustack|Uskewedwithdelims|Uskewed|Uroot|Uright|Uradical|Uoverwithdelims|Uoverdelimiter|Uover|Unosuperscript|Unosuperprescript|Unosubscript|Unosubprescript|Umiddle|Umathunderdelimitervgap|Umathunderdelimiterbgap|Umathunderbarvgap|Umathunderbarrule|Umathunderbarkern|Umathsupsubbottommax|Umathsupshiftup|Umathsupshiftdrop|Umathsupbottommin|Umathsubtopmax|Umathsubsupvgap|Umathsubsupshiftdown|Umathsubshiftdrop|Umathsubshiftdown|Umathstackvgap|Umathstacknumup|Umathstackdenomdown|Umathspacingmode|Umathspacebeforescript|Umathspaceafterscript|Umathskewedfractionvgap|Umathskewedfractionhgap|Umathrelrelspacing|Umathrelpunctspacing|Umathrelordspacing|Umathrelopspacing|Umathrelopenspacing|Umathrelinnerspacing|Umathrelclosespacing|Umathrelbinspacing|Umathradicalvgap|Umathradicalrule|Umathradicalkern|Umathradicaldegreeraise|Umathradicaldegreebefore|Umathradicaldegreeafter|Umathquad|Umathpunctrelspacing|Umathpunctpunctspacing|Umathpunctordspacing|Umathpunctopspacing|Umathpunctopenspacing|Umathpunctinnerspacing|Umathpunctclosespacing|Umathpunctbinspacing|Umathoverdelimitervgap|Umathoverdelimiterbgap|Umathoverbarvgap|Umathoverbarrule|Umathoverbarkern|Umathordrelspacing|Umathordpunctspacing|Umathordordspacing|Umathordopspacing|Umathordopenspacing|Umathordinnerspacing|Umathordclosespacing|Umathordbinspacing|Umathoprelspacing|Umathoppunctspacing|Umathopordspacing|Umathopopspacing|Umathopopenspacing|Umathopinnerspacing|Umathoperatorsize|Umathopenrelspacing|Umathopenpunctspacing|Umathopenordspacing|Umathopenopspacing|Umathopenopenspacing|Umathopeninnerspacing|Umathopenclosespacing|Umathopenbinspacing|Umathopclosespacing|Umathopbinspacing|Umathnolimitsupfactor|Umathnolimitsubfactor|Umathlimitbelowvgap|Umathlimitbelowkern|Umathlimitbelowbgap|Umathlimitabovevgap|Umathlimitabovekern|Umathlimitabovebgap|Umathinnerrelspacing|Umathinnerpunctspacing|Umathinnerordspacing|Umathinneropspacing|Umathinneropenspacing|Umathinnerinnerspacing|Umathinnerclosespacing|Umathinnerbinspacing|Umathfractionrule|Umathfractionnumvgap|Umathfractionnumup|Umathfractiondenomvgap|Umathfractiondenomdown|Umathfractiondelsize|Umathconnectoroverlapmin|Umathcodenum|Umathcode|Umathcloserelspacing|Umathclosepunctspacing|Umathcloseordspacing|Umathcloseopspacing|Umathcloseopenspacing|Umathcloseinnerspacing|Umathcloseclosespacing|Umathclosebinspacing|Umathclass|Umathcharslot|Umathcharnumdef|Umathcharnum|Umathcharfam|Umathchardef|Umathcharclass|Umathchar|Umathbinrelspacing|Umathbinpunctspacing|Umathbinordspacing|Umathbinopspacing|Umathbinopenspacing|Umathbininnerspacing|Umathbinclosespacing|Umathbinbinspacing|Umathaxis|Umathaccent|Uleft|Uhextensible|Udelimiterunder|Udelimiterover|Udelimiter|Udelcodenum|Udelcode|Uchar|Uatopwithdelims|Uatop|Uabovewithdelims|Uabove|UUskewedwithdelims|UUskewed|Omegaversion|Omegarevision|Omegaminorversion|Alephversion|Alephrevision|Alephminorversion| )(?=[^a-zA-Z])",
    "name" : "context.primitive.commands.primitive.tex"
   },
   "reserved" : {
diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index e71e05d2d..da76d02f2 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/doc/context/sources/general/manuals/mk/mk-punk.tex b/doc/context/sources/general/manuals/mk/mk-punk.tex
index 3502736de..122081546 100644
--- a/doc/context/sources/general/manuals/mk/mk-punk.tex
+++ b/doc/context/sources/general/manuals/mk/mk-punk.tex
@@ -1,5 +1,8 @@
 % language=uk
 
+% This only works in MKIV because in LMTX we don't load the font-vir module
+% any longer. No one used it anyway.
+
 \environment mk-environment
 
 \startcomponent mk-punk
diff --git a/metapost/context/base/mpiv/mp-cont.mpiv b/metapost/context/base/mpiv/mp-cont.mpiv
index 083286bee..13d686848 100644
--- a/metapost/context/base/mpiv/mp-cont.mpiv
+++ b/metapost/context/base/mpiv/mp-cont.mpiv
@@ -155,4 +155,4 @@ vardef OuterMargin = if not OnRightPage : LeftMargin  else : RightMargin fi endd
 vardef InnerMargin = if not OnRightPage : RightMargin else : LeftMargin  fi enddef ;
 
 vardef OuterEdge   = if not OnRightPage : LeftEdge    else : RightEdge   fi enddef ;
-vardef InnerEdge   = if not OnRightPage : Rightedge   else : LeftEdge    fi enddef ;
+vardef InnerEdge   = if not OnRightPage : RightEdge   else : LeftEdge    fi enddef ;
diff --git a/metapost/context/base/mpiv/mp-core.mpiv b/metapost/context/base/mpiv/mp-core.mpiv
deleted file mode 100644
index 0ef24e57e..000000000
--- a/metapost/context/base/mpiv/mp-core.mpiv
+++ /dev/null
@@ -1,1558 +0,0 @@
-%D \module
-%D   [       file=mp-core.mpiv,
-%D        version=1999.08.01, % anchoring
-%D          title=\CONTEXT\ \METAPOST\ graphics,
-%D       subtitle=background macros,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-if known context_core : endinput ; fi ;
-
-boolean context_core ; context_core := true ;
-
-%D Copied to here .. not used any more.
-
-if unknown NOfTextColumns : numeric NOfTextColumns ; NOfTextColumns := 1 ; fi ;
-if unknown NOfTextAreas   : numeric NOfTextAreas   ; NOfTextAreas   := 1 ; fi ;
-
-def SaveTextAreas =
-    path    SavedTextAreas  []  ;
-    path    SavedTextColumns[]  ;
-    numeric NOfSavedTextAreas   ;
-    numeric NOfSavedTextColumns ;
-    for i=1 upto NOfTextAreas :
-        SavedTextAreas[i] := TextAreas[i] ;
-    endfor ;
-    for i=1 upto NOfTextColumns :
-        SavedTextColumns[i] := TextColumns[i] ;
-    endfor ;
-    NOfSavedTextAreas   := NOfTextAreas ;
-    NOfSavedTextColumns := NOfTextColumns ;
-enddef ;
-
-def ResetTextAreas =
-    path TextAreas[], TextColumns[], PlainTextArea, RegionTextArea ;
-    numeric NOfTextAreas   ; NOfTextAreas   := 0 ;
-    numeric NOfTextColumns ; NOfTextColumns := 0 ;
-    numeric nofmultipars   ; nofmultipars   := 0 ;
-    TextAreas[0] := TextColumns[0] := origin -- cycle ;
-enddef ;
-
-ResetTextAreas ; SaveTextAreas ; ;
-
-def RegisterTextArea (expr x, y, w, h, d) =
-    begingroup ;
-    save p ; path p ;
-    p := unitsquare xyscaled(w,h+d) shifted (x,y-d) ;
-    if NOfTextAreas>0 :
-        % if needed, concatenate areas
-        if (round(llcorner TextAreas[NOfTextAreas]) = round(ulcorner p)) and
-           (round(lrcorner TextAreas[NOfTextAreas]) = round(urcorner p)) :
-            p :=
-                ulcorner TextAreas[NOfTextAreas] --
-                urcorner TextAreas[NOfTextAreas] --
-                lrcorner p                       --
-                llcorner p                       -- cycle ;
-        else :
-            NOfTextAreas := NOfTextAreas + 1 ;
-        fi ;
-    else :
-        NOfTextAreas := NOfTextAreas + 1 ;
-    fi ;
-    TextAreas[NOfTextAreas] := p ;
-    if NOfTextColumns>0 :
-        if (round(xpart llcorner TextColumns[NOfTextColumns]) = round(xpart ulcorner p)) and
-           (round(xpart lrcorner TextColumns[NOfTextColumns]) = round(xpart urcorner p)) :
-            p :=
-                ulcorner TextColumns[NOfTextColumns] --
-                urcorner TextColumns[NOfTextColumns] --
-                lrcorner p                           --
-                llcorner p                           -- cycle ;
-        else :
-            NOfTextColumns := NOfTextColumns + 1 ;
-        fi ;
-    else :
-        NOfTextColumns := NOfTextColumns + 1 ;
-    fi ;
-    TextColumns[NOfTextColumns] := p ;
-    endgroup ;
-enddef ;
-
-%D We store a local area in slot zero.
-
-def RegisterPlainTextArea(expr x,y,w,h,d) =
-    PlainTextArea := unitsquare xyscaled(w,h+d) shifted (x,y-d) ;
-enddef ;
-
-def RegisterRegionTextArea(expr x,y,w,h,d) =
-    RegionTextArea := unitsquare xyscaled(w,h+d) shifted (x,y-d) ;
-  % RegionTextArea := RegionTextArea enlarged 2mm ;
-enddef ;
-
-def RegisterLocalTextArea (expr x, y, w, h, d) =
-    TextAreas[0] := TextColumns[0] := unitsquare xyscaled(w,h+d) shifted (x,y-d) ;
-enddef ;
-
-def ResetLocalTextArea =
-    TextAreas[0] := TextColumns[0] := origin -- cycle ;
-enddef ;
-
-ResetLocalTextArea ;
-
-vardef InsideTextArea (expr _i_, _xy_) =
-    (round(xpart _xy_) >= round(xpart llcorner TextAreas[_i_])) and
-    (round(xpart _xy_) <= round(xpart lrcorner TextAreas[_i_])) and
-    (round(ypart _xy_) >= round(ypart llcorner TextAreas[_i_])) and
-    (round(ypart _xy_) <= round(ypart urcorner TextAreas[_i_]))
-enddef ;
-
-vardef InsideSavedTextArea (expr _i_, _xy_) =
-    (round(xpart _xy_) >= round(xpart llcorner SavedTextAreas[_i_])) and
-    (round(xpart _xy_) <= round(xpart lrcorner SavedTextAreas[_i_])) and
-    (round(ypart _xy_) >= round(ypart llcorner SavedTextAreas[_i_])) and
-    (round(ypart _xy_) <= round(ypart urcorner SavedTextAreas[_i_]))
-enddef ;
-
-vardef InsideSomeTextArea (expr _xy_) =
-    save ok ; boolean ok ; ok := false ;
-    for i := 1 upto NOfTextAreas :
-        if InsideTextArea(i,_xy_) :
-            ok := true ; % we can move the exit here
-        fi ;
-        exitif ok ;
-    endfor ;
-    ok
-enddef ;
-
-vardef InsideSomeSavedTextArea (expr _xy_) =
-    save ok ; boolean ok ; ok := false ;
-    for i := 1 upto NOfSavedTextAreas :
-        if InsideSavedTextArea(i,_xy_) :
-            ok := true ;
-        fi ;
-        exitif ok ;
-    endfor ;
-    ok
-enddef ;
-
-vardef TextAreaX (expr x) =
-    numeric _TextAreaX_ ; _TextAreaX_ := 0 ;
-    for i := 1 upto NOfTextAreas :
-        if (round(x) >= round(xpart llcorner TextAreas[i])) and
-           (round(x) <= round(xpart lrcorner TextAreas[i])) :
-            _TextAreaX_ := xpart llcorner TextAreas[i] ;
-        fi ;
-    endfor ;
-    _TextAreaX_
-enddef ;
-
-vardef TextAreaY (expr y) =
-    numeric _TextAreaY_ ; _TextAreaY_ := 0 ;
-    for i := 1 upto NOfTextAreas :
-        if (round(y) >= round(ypart llcorner TextAreas[NOfTextAreas])) and
-           (round(y) <= round(ypart ulcorner TextAreas[NOfTextAreas])) :
-            _TextAreaY_ := ypart llcorner TextAreas[NOfTextAreas] ;
-        fi ;
-    endfor ;
-    _TextAreaY_
-enddef ;
-
-vardef TextAreaXY (expr x, y) =
-    pair _TextAreaXY_ ; _TextAreaXY_ := origin ;
-    for i := 1 upto NOfTextAreas :
-        if (round(x) >= round(xpart llcorner TextAreas[i])) and
-           (round(x) <= round(xpart lrcorner TextAreas[i])) and
-           (round(y) >= round(ypart llcorner TextAreas[i])) and
-           (round(y) <= round(ypart ulcorner TextAreas[i])) :
-            _TextAreaXY_ := llconer TextAreas[i] ;
-        fi ;
-    endfor ;
-    _TextAreaXY_
-enddef ;
-
-vardef TextAreaW (expr x) =
-    numeric _TextAreaW_ ; _TextAreaW_ := 0 ;
-    for i := 1 upto NOfTextAreas :
-        if (round(x) >= round(xpart llcorner TextAreas[i])) and
-           (round(x) <= round(xpart lrcorner TextAreas[i])) :
-            _TextAreaW_ := bbwidth(TextAreas[i]) ;
-        fi ;
-    endfor ;
-    _TextAreaW_
-enddef ;
-
-vardef TextAreaH (expr y) =
-    numeric _TextAreaH_ ; _TextAreaH_ := 0 ;
-    for i := 1 upto NOfTextAreas :
-        if (round(y) >= round(ypart llcorner TextAreas[i])) and
-           (round(y) <= round(ypart ulcorner TextAreas[i])) :
-            _TextAreaH_ := bbheight(TextAreas[i]) ;
-        fi ;
-      endfor ;
-      _TextAreaH_
-enddef ;
-
-vardef TextAreaWH (expr x, y) =
-      pair _TextAreaWH_ ; _TextAreaWH_ := origin ;
-      for i := 1 upto NOfTextAreas :
-        if (round(x) >= round(xpart llcorner TextAreas[i])) and
-           (round(x) <= round(xpart lrcorner TextAreas[i])) and
-           (round(y) >= round(ypart llcorner TextAreas[i])) and
-           (round(y) <= round(ypart ulcorner TextAreas[i])) :
-            _TextAreaWH_ := (bbwidth(TextAreas[i]),bbheight(TextAreas[i])) ;
-        fi ;
-      endfor ;
-      _TextAreaWH_
-enddef ;
-
-%D Till here.
-
-pair    lxy[], rxy[], cxy[], llxy[], lrxy[], ulxy[], urxy[] ;
-path    pxy[] ;
-numeric hxy[], wxy[], dxy[], nxy[] ;
-
-def box_found (expr n,x,y,w,h,d) =
-    not ((x=0) and (y=0) and (w=0) and (h=0) and (d=0))
-enddef ;
-
-def initialize_box_pos (expr pos,n,x,y,w,h,d) =
-    pair lxy, rxy, cxy, llxy, lrxy, ulxy, urxy ;
-    path pxy ; numeric hxy, wxy, dxy, nxy;
-    lxy  := (x,y) ;
-    llxy := (x,y-d) ;
-    lrxy := (x+w,y-d) ;
-    urxy := (x+w,y+h) ;
-    ulxy := (x,y+h) ;
-    wxy  := w ;
-    hxy  := h ;
-    dxy  := d ;
-    rxy  := lxy shifted (wxy,0) ;
-    pxy  := llxy--lrxy--urxy--ulxy--cycle ;
-    cxy  := center pxy ;
-    nxy  := n ;
-    freeze_box(pos) ;
-enddef ;
-
-def freeze_box (expr pos) =
-    lxy[pos]  := lxy  ;
-    llxy[pos] := llxy ;
-    lrxy[pos] := lrxy ;
-    urxy[pos] := urxy ;
-    ulxy[pos] := ulxy ;
-    wxy[pos]  := wxy  ;
-    hxy[pos]  := hxy  ;
-    dxy[pos]  := dxy  ;
-    rxy[pos]  := rxy  ;
-    pxy[pos]  := pxy  ;
-    cxy[pos]  := cxy  ;
-    nxy[pos]  := nxy  ;
-enddef ;
-
-def initialize_box (expr n,x,y,w,h,d) =
-    numeric bpos ; bpos := 0 ; initialize_box_pos(bpos,n,x,y,w,h,d) ;
-enddef ;
-
-def initialize_area (expr fn,fx,fy,fw,fh,fd,
-                          tn,tx,ty,tw,th,td) =
-    numeric fpos ; fpos := 1 ; initialize_box_pos(fpos,fn,fx,fy,fw,fh,fd) ;
-    numeric tpos ; tpos := 2 ; initialize_box_pos(tpos,tn,tx,ty,tw,th,td) ;
-    do_initialize_area (fpos, tpos) ;
-enddef ;
-
-def do_initialize_area (expr fpos, tpos) =
-    lxy  := lxy[fpos] ;
-    llxy := (xpart llxy[fpos], ypart llxy[tpos]) ;
-    lrxy := lrxy[tpos] ;
-    urxy := (xpart urxy[tpos], ypart urxy[fpos]) ;
-    ulxy := ulxy[fpos] ;
-    wxy  := xpart lrxy - xpart llxy ;
-    hxy  := hxy[fpos] ;
-    dxy  := dxy[tpos] ;
-    rxy  := lxy shifted (wxy,0) ;
-    pxy  := llxy--lrxy--urxy--ulxy--cycle ;
-    cxy  := center pxy ;
-enddef ;
-
-def set_par_line_height (expr ph, pd) =
-    par_strut_height := if ph>0 : ph elseif StrutHeight>0 : StrutHeight else : 8pt fi ;
-    par_strut_depth  := if pd>0 : pd elseif StrutDepth >0 : StrutDepth  else : 3pt fi ;
-    par_line_height  := par_strut_height + par_strut_depth ;
-enddef ;
-
-def initialize_par (expr fn,fx,fy,fw,fh,fd,
-                         tn,tx,ty,tw,th,td,
-                         mn,mx,my,mw,mh,md,
-                         pn,px,py,pw,ph,pd,
-                         rw,rl,rr,rh,ra,ri) =
-
-    numeric fpos ; fpos := 1 ; initialize_box_pos(fpos,fn,fx,fy,fw,fh,fd) ;
-    numeric tpos ; tpos := 2 ; initialize_box_pos(tpos,tn,tx,ty,tw,th,td) ;
-    numeric mpos ; mpos := 3 ; initialize_box_pos(mpos,mn,mx,my,mw,mh,md) ;
-    numeric ppos ; ppos := 4 ; initialize_box_pos(ppos,pn,px,py,pw,ph,pd) ;
-
-    numeric par_strut_height, par_strut_depth, par_line_height ;
-
-    set_par_line_height (ph, pd) ;
-
-    do_initialize_area (fpos, tpos) ;
-    do_initialize_par  (fpos, tpos, mpos, ppos, rw,rl,rr,rh,ra,ri) ;
-
-enddef ;
-
-def initialize_area_par (expr fn,fx,fy,fw,fh,fd,
-                              tn,tx,ty,tw,th,td,
-                              wn,wx,wy,ww,wh,wd) =
-
-    numeric fpos ; fpos := 1 ; initialize_box_pos(fpos,fn,fx,fy,fw,fh,fd) ;
-    numeric tpos ; tpos := 2 ; initialize_box_pos(tpos,tn,tx,ty,tw,th,td) ;
-    numeric wpos ; wpos := 3 ; initialize_box_pos(wpos,wn,wx,wy,ww,wh,wd) ;
-
-    numeric par_strut_height, par_strut_depth, par_line_height ;
-
-    set_par_line_height (wh, wd) ;
-
-    numeric ffpos ; ffpos := 4 ; initialize_box_pos(ffpos,wn,wx,fy,0,wh,wd) ;
-    numeric ttpos ; ttpos := 5 ; initialize_box_pos(ttpos,wn,wx+ww,ty,0,wh,wd) ;
-
-    do_initialize_area (ffpos, ttpos) ;
-
-    numeric mpos ; mpos := 6 ; freeze_box(mpos) ;
-
-    do_initialize_par  (fpos, tpos, mpos, ffpos, 0,0,0,0,0,0) ;
-
-enddef ;
-
-def do_initialize_par (expr fpos, tpos, mpos, ppos, rw,rl,rr,rh,ra,ri) =
-
-    pair lref, rref, pref, lhref, rhref ;
-
-    % clip the page area to the left and right skips
-
-    llxy[mpos] := llxy[mpos] shifted (+rl,0) ;
-    lrxy[mpos] := lrxy[mpos] shifted (-rr,0) ;
-    urxy[mpos] := urxy[mpos] shifted (-rr,0) ;
-    ulxy[mpos] := ulxy[mpos] shifted (+rl,0) ;
-
-    % fixate the leftskip, rightskip and hanging indentation
-
-    lref := (xpart llxy[mpos],ypart ulxy[ppos]) ; lhref := lref shifted (rh,0) ;
-    rref := (xpart lrxy[mpos],ypart urxy[ppos]) ; rhref := rref shifted (rh,0) ;
-
-    pref := lxy[ppos] ;
-
-    if nxy[tpos] > nxy[fpos] :
-        if nxy[fpos] = nxy[mpos] :
-            % first of multiple pages
-            llxy[tpos] := llxy[mpos] ;
-            lrxy[tpos] := lrxy[mpos] ;
-            urxy[tpos] := lrxy[mpos] shifted (0,par_line_height) ;
-            ulxy[tpos] := llxy[mpos] shifted (0,par_line_height) ;
-            boxgriddirection := down ;
-        elseif nxy[tpos] = nxy[mpos] :
-            % last of multiple pages
-            llxy[fpos] := ulxy[mpos] shifted (0,-par_line_height) ;
-            lrxy[fpos] := urxy[mpos] shifted (0,-par_line_height) ;
-            urxy[fpos] := urxy[mpos] ;
-            ulxy[fpos] := ulxy[mpos] ;
-            boxgriddirection := up ;
-        else :
-            % middle of multiple pages
-            llxy[fpos] := ulxy[mpos] shifted (0,-par_line_height) ;
-            lrxy[fpos] := urxy[mpos] shifted (0,-par_line_height) ;
-            urxy[fpos] := urxy[mpos] ;
-            ulxy[fpos] := ulxy[mpos] ;
-            llxy[tpos] := llxy[mpos] ;
-            lrxy[tpos] := lrxy[mpos] ;
-            urxy[tpos] := lrxy[mpos] shifted (0,par_line_height) ;
-            ulxy[tpos] := llxy[mpos] shifted (0,par_line_height) ;
-            boxgriddirection := up ;
-        fi ;
-    else :
-        % just one page
-        boxgriddirection := up ;
-    fi ;
-
-    path txy, bxy, pxy, mxy ;
-
-    txy := originpath ; % top
-    bxy := originpath ; % bottom
-    pxy := originpath ; % composed
-
-    boolean lefthang, righthang, somehang ;
-
-    % we only hang on the first of a multiple page background
-
-    if nxy[mpos] > nxy[fpos] :
-        lefthang := righthang := somehang := false ;
-    else :
-        lefthang := (rh>0) ; righthang := (rh<0) ; somehang := false ;
-    fi ;
-
-    if lefthang :
-        mxy  := boundingbox (lref -- lref shifted (rh,ra*par_line_height)) ;
-    elseif righthang :
-        mxy  := boundingbox (rref -- rref shifted (rh,ra*par_line_height)) ;
-    else :
-        mxy  := originpath ;
-    fi ;
-
-    if round(ypart llxy[fpos]) = round(ypart llxy[tpos]) :
-
-        % We have a one-liner. Watch how er use the bottom pos for
-        % determining the height.
-
-        llxy[fpos] := (xpart llxy[fpos], ypart llxy[tpos]) ;
-        ulxy[fpos] := (xpart ulxy[fpos], ypart ulxy[tpos]) ;
-
-    else :
-
-        % We have a multi-liner. For convenience we now correct the
-        % begin and end points for indentation.
-
-        if lefthang and (round(ypart llxy[tpos]) >= round(ypart lrcorner mxy)) :
-            llxy[tpos] := (xpart lhref, ypart llxy[tpos]) ;
-            ulxy[tpos] := (xpart lhref, ypart ulxy[tpos]) ;
-        else :
-            llxy[tpos] := (xpart  lref, ypart llxy[tpos]) ;
-            ulxy[tpos] := (xpart  lref, ypart ulxy[tpos]) ;
-        fi ;
-
-        if righthang and (round(ypart lrxy[fpos]) >= round(ypart llcorner mxy)) :
-            lrxy[fpos] := (xpart rhref, ypart lrxy[fpos]) ;
-            urxy[fpos] := (xpart rhref, ypart urxy[fpos]) ;
-        else :
-            lrxy[fpos] := (xpart  rref, ypart lrxy[fpos]) ;
-            urxy[fpos] := (xpart  rref, ypart urxy[fpos]) ;
-        fi ;
-
-    fi ;
-
-    somehang := (ypart ulxy[fpos]>ypart llcorner mxy) and
-                (ypart llxy[tpos]<ypart llcorner mxy) ;
-
-    if round(ypart llxy[fpos]) = round(ypart llxy[tpos]) :
-
-        % A (short) one-liner goes into the top box.
-
-        txy := llxy[fpos] -- lrxy[tpos] -- urxy[tpos] -- ulxy[fpos] -- cycle ;
-
-    elseif (round(ypart llxy[fpos]) = round(ypart ulxy[tpos])) and
-           (round(xpart lrxy[tpos]) < round(xpart llxy[fpos])) :
-
-        % We have a sentence that spans two lines but with only end
-        % of line and begin of line segments. We need to take care of
-        % indentation.
-
-        txy := llxy[fpos] -- lrxy[fpos] -- urxy[fpos] -- ulxy[fpos] -- cycle ;
-        bxy := llxy[tpos] -- lrxy[tpos] -- urxy[tpos] -- ulxy[tpos] -- cycle ;
-
-    elseif (round(ypart llxy[fpos]) = round(ypart ulxy[tpos])) :
-
-        % We have a sentence that spans two lines but with overlap.
-
-        pxy :=
-            llxy[tpos] -- lrxy[tpos] -- urxy[tpos] -- lrxy[fpos] --
-            urxy[fpos] -- ulxy[fpos] -- llxy[fpos] -- ulxy[tpos] -- cycle ;
-
-    elseif lefthang and somehang :
-
-        % We have a sentence that spans more than two lines with
-        % left hanging indentation.
-
-        pxy :=
-            llxy[tpos] -- lrxy[tpos] -- urxy[tpos] --
-            (xpart urxy[fpos],ypart urxy[tpos]) --
-            urxy[fpos] -- ulxy[fpos] -- llxy[fpos] --
-            if round(ypart urxy[tpos]) < round(ypart llcorner mxy) :
-               (xpart lrcorner mxy,ypart llxy[fpos]) --
-               lrcorner mxy --
-               (xpart llxy[tpos],ypart llcorner mxy) --
-            else :
-               (xpart llxy[tpos],ypart llxy[fpos]) --
-            fi
-            cycle ;
-
-    elseif righthang and somehang :
-
-        % We have a sentence that spans more than two lines with
-        % right hanging indentation.
-
-        pxy :=
-            llxy[tpos] -- lrxy[tpos] -- urxy[tpos] --
-            if round(ypart urxy[tpos]) < round(ypart llcorner mxy) :
-                (xpart lrcorner mxy,ypart urxy[tpos]) --
-                lrcorner mxy -- llcorner mxy --
-            else :
-                (xpart urxy[fpos],ypart urxy[tpos]) --
-            fi
-            urxy[fpos] -- ulxy[fpos] -- llxy[fpos] --
-            (xpart llxy[tpos],ypart llxy[fpos]) --
-            cycle ;
-
-    else :
-
-        % We have a sentence that spans more than two lines with
-        % no hanging indentation.
-
-        pxy :=
-            llxy[tpos] -- lrxy[tpos] -- urxy[tpos] --
-            (xpart urxy[fpos],ypart urxy[tpos]) --
-            urxy[fpos] -- ulxy[fpos] -- llxy[fpos] --
-            (xpart llxy[tpos],ypart llxy[fpos]) --
-            cycle ;
-
-    fi ;
-
-    pxy := simplified pxy ;
-    pxy := unspiked   pxy ;
-
-enddef ;
-
-pair last_multi_par_shift ; last_multi_par_shift := origin ;
-
-def relocate_multipars (expr xy) =
-    last_multi_par_shift := xy ;
-    for i=1 upto nofmultipars :
-        multipars[i] := multipars[i] shifted last_multi_par_shift ;
-    endfor ;
-enddef ;
-
-boolean compensate_multi_par_topskip ;
-boolean span_multi_column_pars ;
-boolean auto_multi_par_hsize ;
-boolean enable_multi_par_fallback ;
-
-compensate_multi_par_topskip := true ;
-span_multi_column_pars       := false ;
-auto_multi_par_hsize         := false ; % true ;
-enable_multi_par_fallback    := true ;
-
-vardef multi_par_at_top (expr i) =
-  (round (ypart ulcorner multipars[i]) = round (ypart ulcorner (TextAreas[multirefs[i]] shifted last_multi_par_shift)))
-enddef ;
-
-numeric nofmultipars ; nofmultipars := 0 ;
-
-boolean obey_multi_par_hang    ; obey_multi_par_hang    := true  ;
-boolean obey_multi_par_more    ; obey_multi_par_more    := true  ;
-boolean snap_multi_par_tops    ; snap_multi_par_tops    := true  ;
-boolean local_multi_par_area   ; local_multi_par_area   := false ;
-boolean use_multi_par_region   ; use_multi_par_region   := false ;
-boolean ignore_multi_par_page  ; ignore_multi_par_page  := false ;
-boolean force_multi_par_chain  ; force_multi_par_chain  := true  ;
-boolean one_piece_multi_par    ; one_piece_multi_par    := false ;
-boolean check_multi_par_chain  ; check_multi_par_chain  := true  ; % extra page check
-
-boolean multi_column_first_page_hack; multi_column_first_page_hack := true ; % seems to work ok
-
-def simplify_multi_pars = % boundingbox ipv shape als optie
-    for i := 1 upto nofmultipars :
-        multipars[i] := boundingbox multipars[i] ;
-    endfor ;
-enddef ;
-
-def save_multipar (expr i, l, p) =
-    nofmultipars := nofmultipars + 1 ;
-    multirefs[nofmultipars] := i ;
-    multilocs[nofmultipars] := l ;
-    multipars[nofmultipars] := unspiked (simplified p) ;
-enddef ;
-
-def prepare_multi_pars (expr fn,fx,fy,fw,fh,fd,
-                             tn,tx,ty,tw,th,td,
-                             wn,wx,wy,ww,wh,wd,
-                             pn,px,py,pw,ph,pd,
-                             rw,rl,rr,rh,ra,ri) =
-
-% fill PlainTextArea withcolor red ;
-% fill RegionTextArea withcolor green;
-
-    if span_multi_column_pars :
-        begingroup ;
-        save TextAreas ; path TextAreas[] ;
-        save NOfTextAreas ; numeric NOfTextAreas ;
-        for i=1 upto NOfTextColumns :
-            TextAreas[i] := TextColumns[i] ;
-        endfor ;
-        NOfTextAreas := NOfTextColumns ;
-    fi ;
-
-    last_multi_par_shift := origin ;
-
-% save _tx_, _ty_, _fx_, _fy_ ;
-% if use_multi_par_region :
-%     _fx_ := fx ; %min(xpart ulcorner RegionTextArea,fx) ;
-%     _fy_ := fy ; %min(xpart ulcorner RegionTextArea,fy) ;
-%     _tx_ := min(xpart lrcorner RegionTextArea,tx) ;
-%     _ty_ := min(xpart lrcorner RegionTextArea,ty) ;
-% else :
-%     _fx_ := fx ;
-%     _fy_ := fy ;
-%     _tx_ := tx ;
-%     _ty_ := ty ;
-% fi ;
-
-%     numeric fpos ; fpos := 1 ; initialize_box_pos(fpos,fn,_fx_,_fy_,fw,fh,fd) ;
-%     numeric tpos ; tpos := 2 ; initialize_box_pos(tpos,tn,_tx_,_ty_,tw,th,td) ;
-    numeric fpos ; fpos := 1 ; initialize_box_pos(fpos,fn,fx,fy,fw,fh,fd) ;
-    numeric tpos ; tpos := 2 ; initialize_box_pos(tpos,tn,tx,ty,tw,th,td) ;
-    numeric wpos ; wpos := 3 ; initialize_box_pos(wpos,wn,wx,wy,ww,wh,wd) ;
-    numeric ppos ; ppos := 4 ; initialize_box_pos(ppos,pn,px,py,pw,ph,pd) ;
-
-    if local_multi_par_area :
-        RealPageNumber := fn ;
-        NOfTextAreas := 1 ;
-        NOfSavedTextAreas := 0 ;
-        TextAreas[1] := TextAreas[0] ;
-        TextColumns[1] := TextColumns[0] ;
-        nxy[fpos] := nxy[tpos] := nxy[wpos] := nxy[ppos] := RealPageNumber ;
-    elseif use_multi_par_region :
-        RealPageNumber := fn ;
-        NOfTextAreas := 1 ;
-        NOfSavedTextAreas := 0 ;
-        TextAreas[1] := RegionTextArea ;
-        TextColumns[1] := RegionTextArea ;
-        nxy[fpos] := nxy[tpos] := nxy[wpos] := nxy[ppos] := RealPageNumber ;
-    elseif ignore_multi_par_page :
-        RealPageNumber := fn ;
-        nxy[fpos] := nxy[tpos] := nxy[wpos] := nxy[ppos] := RealPageNumber ;
-    fi ;
-
-    numeric par_strut_height, par_strut_depth, par_line_height ;
-
-    set_par_line_height (ph, pd) ;
-
-    numeric par_hang_indent, par_hang_after, par_indent, par_left_skip, par_right_skip ;
-
-    par_hang_indent  := rh ;
-    par_hang_after   := ra ;
-    par_indent       := ri ;
-    par_left_skip    := rl ;
-    par_right_skip   := rr ;
-
-    pair par_start_pos ;
-    pair par_stop_pos ;
-
-    par_start_pos := llxy[fpos]
-        if par_indent   <0: shifted (-par_indent,   0) fi
-        if par_left_skip<0: shifted (-par_left_skip,0) fi ;
-
-    par_stop_pos := lrxy[tpos]
-        if par_right_skip<0: shifted (par_right_skip,0) fi ; % nasty as the endpos can be shifted by rightskip
-
-    if wxy[wpos]>0 :
-        left_skip  := rl + xpart llxy[wpos] - xpart llxy[ppos] ;
-        right_skip := rw - left_skip - ww ;
-    else :
-        left_skip  := rl ;
-        right_skip := rr ;
-    fi ;
-
-    path    multipar, multipars[] ;
-    numeric multiref, multirefs[] ;
-    numeric multiloc, multilocs[] ; % 1=begin 2=between 3=end
-
-    numeric multi_par_pages ; multi_par_pages := nxy[tpos]-nxy[fpos]+1 ;
-
-    % locals .. why can't i move these outside?
-
-    vardef _pmp_set_multipar_ (expr i) =
-        ( (TextAreas[i] leftenlarged -left_skip) rightenlarged (-right_skip
-        if auto_multi_par_hsize : + rw - bbwidth(TextAreas[i]) fi) )
-    enddef ;
-
-    vardef _pmp_snapped_multi_pos_ (expr p) =
-        if snap_multi_par_tops :
-            if abs(ypart p - ypart ulcorner multipar) < par_line_height :
-                (xpart p,ypart ulcorner multipar)
-            else :
-                p
-            fi
-        else :
-            p
-        fi
-    enddef ;
-
-    vardef _pmp_estimated_par_lines_ (expr h) =
-        round(h/par_line_height)
-    enddef ;
-
-    vardef _pmp_top_multi_par_(expr p) =
-        (round(_pmp_estimated_par_lines_(bbheight(p)*par_line_height))=round(bbheight(p)))
-    enddef ;
-
-    vardef _pmp_multi_par_tsc_(expr p) =
-        if _pmp_top_multi_par_(p) : TopSkipCorrection else : 0 fi
-    enddef ;
-
-    vardef _pmp_estimated_multi_par_height_ (expr n, t) =
-        if round(par_line_height)=0 :
-            0
-        else :
-            save ok, h ; boolean ok ;
-            numeric h ; h := 0 ;
-            ok := false ;
-            if (nxy[fpos]=RealPageNumber-1) :
-                for i := 1 upto NOfSavedTextAreas :
-                    if (InsideSavedTextArea(i,par_start_pos)) :
-                        ok := true ;
-                        h := h + _pmp_estimated_par_lines_(ypart ulxy[fpos] - ypart llcorner SavedTextAreas[i]) ;
-                    elseif ok :
-                        h := h + _pmp_estimated_par_lines_(bbheight(SavedTextAreas[i])) ;
-                    fi ;
-                endfor ;
-            fi ;
-            if ok :
-                for i := 1 upto n-1 :
-                    h := h + _pmp_estimated_par_lines_(bbheight(TextAreas[i])) ;
-                endfor ;
-            else :
-                % already: ok := false ;
-                for i := 1 upto n-1 :
-                    if (InsideTextArea(i,par_start_pos)) :
-                        ok := true ;
-                        h := h + _pmp_estimated_par_lines_(ypart ulxy[fpos] - ypart llcorner TextAreas[i]) ;
-                    elseif ok :
-                        h := h + _pmp_estimated_par_lines_(bbheight(TextAreas[i])) ;
-                    fi ;
-                endfor ;
-            fi ;
-            h
-        fi
-    enddef ;
-
-    vardef _pmp_left_top_hang_ (expr same_area) =
-
-        par_hang_after := ra + _pmp_estimated_par_lines_(py-fy) ;
-
-        if (par_hang_indent>0) and (par_hang_after<0) and obey_multi_par_hang :
-            pair _ul_ ; _ul_ := (xpart ulcorner multipar, ypart _pmp_snapped_multi_pos_(ulxy[fpos]));
-            pair _pa_ ; _pa_ := _ul_ shifted (0,par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart llcorner multipar)) ;
-            if same_area :
-                _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart llxy[tpos])) ;
-            fi ;
-            if obey_multi_par_more and (round(par_line_height)>0) :
-                par_hang_after := min(0,round(par_hang_after + (ypart urxy[fpos]-ypart _pa_)/par_line_height)) ;
-            fi ;
-            (xpart _ul_ + par_hang_indent, ypart lrxy[fpos]) --
-            (xpart _ul_ + par_hang_indent, ypart _pa_) --
-            (xpart ulcorner multipar, ypart _pa_)
-        else :
-            (xpart ulcorner multipar, ypart lrxy[fpos])
-        fi
-    enddef ;
-
-    vardef _pmp_right_top_hang_ (expr same_area) =
-
-        par_hang_after := ra + _pmp_estimated_par_lines_(py-fy) ;
-
-        if (par_hang_indent<0) and (par_hang_after<0) and obey_multi_par_hang :
-            pair _ur_ ; _ur_ := (xpart urcorner multipar, ypart _pmp_snapped_multi_pos_(urxy[fpos])) ;
-            pair _pa_ ; _pa_ := _ur_ shifted (0,par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart llcorner multipar)) ;
-            if same_area :
-                _pa_ := (xpart _pa_,max(ypart _pa_ -TopSkipCorrection,ypart _pmp_snapped_multi_pos_(ulxy[tpos]))) ;
-            fi ;
-            if obey_multi_par_more and (round(par_line_height)>0) :
-                par_hang_after := min(0,round(par_hang_after + (ypart urxy[fpos]-ypart _pa_)/par_line_height)) ;
-            fi ;
-            (xpart urcorner multipar, ypart _pa_) --
-            (xpart _ur_ + par_hang_indent, ypart _pa_) --
-            (xpart _ur_ + par_hang_indent, ypart _pmp_snapped_multi_pos_(urxy[fpos]))
-        else :
-            (xpart urcorner multipar, ypart _pmp_snapped_multi_pos_(urxy[fpos]))
-        fi
-    enddef ;
-
-    vardef _pmp_x_left_top_hang_ (expr i, t) =
-        par_hang_after := min(0,ra + _pmp_estimated_multi_par_height_(i,t)) ;
-        if (par_hang_indent>0) and (par_hang_after<0) :
-            pair _ul_ ; _ul_ := ulcorner multipar ;
-            pair _pa_ ; _pa_ := _ul_ shifted (0,par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart llcorner multipar)) ;
-            if t :
-                _pa_ := (xpart _pa_,max(ypart _pa_,ypart llxy[tpos]));
-            fi ;
-            if abs(ypart _pa_-ypart llxy[tpos])<par_line_height :
-                _pa_ := (xpart _pa_,ypart llxy[tpos]);
-            fi ;
-            if abs(ypart _pa_-ypart llcorner multipar)<par_line_height :
-                _pa_ := (xpart _pa_,ypart llcorner multipar);
-            fi ;
-            (xpart _ul_, ypart _pa_) --
-            (xpart _ul_ + par_hang_indent, ypart _pa_) --
-            (xpart _ul_ + par_hang_indent, ypart _ul_)
-        else :
-            ulcorner multipar
-        fi
-    enddef ;
-
-    vardef _pmp_x_right_top_hang_ (expr i, t) =
-        par_hang_after := min(0,ra + _pmp_estimated_multi_par_height_(i,t)) ;
-        if (par_hang_indent<0) and (par_hang_after<0) :
-            pair _ur_ ; _ur_ := urcorner multipar ;
-            pair _pa_ ; _pa_ := _ur_ shifted (0,par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart lrcorner multipar)) ;
-            if t :
-                _pa_ := (xpart _pa_,max(ypart _pa_,ypart _pmp_snapped_multi_pos_(urxy[tpos]))) ;
-            fi ;
-            (xpart _ur_ + par_hang_indent, ypart _ur_) --
-            (xpart _ur_ + par_hang_indent, ypart _pa_) --
-            (xpart _ur_, ypart _pa_)
-        else :
-            urcorner multipar
-        fi
-    enddef ;
-
-    vardef _pmp_left_bottom_hang_ (expr same_area) =
-        pair _ll_, _sa_, _pa_ ;
-        _sa_ := if same_area : llxy[tpos] else : lrcorner multipar fi ;
-        if (par_hang_indent>0) and (par_hang_after>0) and obey_multi_par_hang :
-            _ll_ := (xpart ulcorner multipar, ypart _pmp_snapped_multi_pos_(ulxy[fpos])) ;
-            _pa_ := _ll_ shifted (0,-par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart llcorner multipar)) ;
-            if same_area :
-                _pa_ := (xpart _pa_,max(ypart _pa_,ypart _sa_)) ;
-            fi ;
-            if obey_multi_par_more and (round(par_line_height)>0) :
-                par_hang_after := max(0,round(par_hang_after - (ypart urxy[fpos]-ypart _pa_)/par_line_height)) ;
-            fi ;
-            _pa_ --
-            (xpart _pa_ + par_hang_indent,ypart _pa_) --
-            (xpart _pa_ + par_hang_indent,ypart _sa_)
-        else :
-            (xpart llcorner multipar, ypart _sa_)
-        fi
-    enddef ;
-
-    vardef _pmp_right_bottom_hang_ (expr same_area) =
-        pair _lr_, _sa_, _pa_ ;
-        _sa_ := if same_area : _pmp_snapped_multi_pos_(ulxy[tpos]) else : lrcorner multipar fi ;
-        if (par_hang_indent<0) and (par_hang_after>0) and obey_multi_par_hang :
-            _lr_ := (xpart urcorner multipar, ypart _pmp_snapped_multi_pos_(urxy[fpos])) ;
-            _pa_ := _lr_ shifted (0,-par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart lrcorner multipar)) ;
-            if same_area :
-                _pa_ := (xpart _pa_,max(ypart _pa_,ypart _pmp_snapped_multi_pos_(ulxy[tpos]))) ;
-            fi ;
-            if obey_multi_par_more and (round(par_line_height)>0) :
-                par_hang_after := max(0,round(par_hang_after - (ypart urxy[fpos]-ypart _pa_)/par_line_height)) ;
-            fi ;
-            (xpart _pa_ + par_hang_indent,ypart _sa_) --
-            (xpart _pa_ + par_hang_indent,ypart _pa_) --
-            _pa_
-        else :
-        (xpart lrcorner multipar, ypart _sa_)
-        fi
-    enddef ;
-
-    vardef _pmp_x_left_bottom_hang_ (expr i, t) =
-        pair _ll_, _sa_, _pa_ ;
-        _sa_ := if t : llxy[tpos] else : llcorner multipar fi ;
-        if (par_hang_indent>0) and (ra>0) :
-            par_hang_after := max(0,ra - _pmp_estimated_multi_par_height_(i,t)) ;
-            _ll_ := ulcorner multipar ;
-            _pa_ := _ll_ shifted (0,-par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart llcorner multipar)) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart _sa_)) ;
-            % we need to compensate for topskip enlarged areas
-            if abs(ypart _pa_ - ypart _sa_) > par_line_height :
-                (xpart _pa_ + par_hang_indent,ypart _sa_) --
-                (xpart _pa_ + par_hang_indent,ypart _pa_) --
-            fi
-            _pa_
-        else :
-            (xpart llcorner multipar, ypart _sa_)
-        fi
-    enddef ;
-
-    vardef _pmp_x_right_bottom_hang_ (expr i, t) =
-        pair _lr_, _sa_, _pa_ ;
-        _sa_ := if t : _pmp_snapped_multi_pos_(ulxy[tpos]) else : llcorner multipar fi ;
-        if (par_hang_indent<0) and (ra>0) :
-            par_hang_after := max(0,ra - _pmp_estimated_multi_par_height_(i, t)) ;
-            _lr_ := urcorner multipar ;
-            _pa_ := _lr_ shifted (0,-par_hang_after*par_line_height) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart lrcorner multipar)) ;
-            _pa_ := (xpart _pa_,max(ypart _pa_,ypart _sa_)) ;
-            % we need to compensate for topskip enlarged areas
-            _pa_
-            if abs(ypart _pa_ - ypart _sa_) > par_line_height :
-                -- (xpart _pa_ + par_hang_indent,ypart _pa_)
-                -- (xpart _pa_ + par_hang_indent,ypart _sa_)
-            fi
-        else :
-            (xpart lrcorner multipar, ypart _sa_)
-        fi
-    enddef ;
-
-    % def _pmp_test_multipar_ =
-    %     multipar := boundingbox multipar ;
-    % enddef ;
-
-    % first loop
-
-    ii := 0 ; nn := NOfTextAreas+1 ; nofmultipars := 0 ;
-
-    if enable_multi_par_fallback  and (nxy[fpos]=RealPageNumber)
-        and (nxy[tpos]=RealPageNumber) and not (InsideSomeTextArea(lxy[fpos]) and InsideSomeTextArea(rxy[tpos])) :
-
-        % fallback
-
-        % multipar :=
-        %     llxy[fpos] --
-        %     lrxy[tpos] --
-        %     urxy[tpos] --
-        %     ulxy[fpos] -- cycle ;
-        %
-        % save_multipar (1,1,multipar) ;
-
-        % we need to take the boundingbox because there can be
-        % more lines and we want a proper rectange
-
-        multipar :=
-            ulxy[fpos] --
-            urxy[tpos] --
-            lrxy[fpos] --
-            llxy[tpos] -- cycle ;
-
-        save_multipar (1,1,boundingbox(multipar)) ;
-
-    else :
-
-        % normal
-
-        for i=1 upto NOfTextAreas :
-
-            TopSkipCorrection := 0 ;
-
-            multipar := _pmp_set_multipar_(i) ;
-
-            % watch how we compensate for negative indentation
-
-            if (nxy[fpos]=RealPageNumber) and (InsideTextArea(i,par_start_pos)) :
-
-                % first one in chain
-
-                ii := i ;
-
-                if (nxy[tpos]=RealPageNumber) and (InsideTextArea(i,par_stop_pos)) :
-
-                    % in same area
-
-                    nn := i ;
-
-                    if compensate_multi_par_topskip and (round(LineHeight-ph-pd)=0) :
-
-                        TopSkipCorrection := TopSkip - StrutHeight ;
-
-                        if round(ypart ulxy[fpos] + TopSkipCorrection) = round(ypart ulcorner TextAreas[i]) :
-                            ulxy[fpos] := ulxy[fpos] shifted (0,TopSkipCorrection) ;
-                            urxy[fpos] := urxy[fpos] shifted (0,TopSkipCorrection) ;
-                        else :
-                            TopSkipCorrection := 0 ;
-                        fi ;
-
-                    fi ;
-
-                    if ypart llxy[fpos] = ypart llxy[tpos] :
-
-                        multipar :=
-                            llxy[fpos] --
-                            lrxy[tpos] --
-                            _pmp_snapped_multi_pos_(urxy[tpos]) --
-                            _pmp_snapped_multi_pos_(ulxy[fpos]) --
-                            cycle ;
-
-                        save_multipar (i,1,multipar) ;
-
-                    elseif (ypart llxy[fpos] = ypart ulxy[tpos]) and (xpart llxy[tpos] < xpart llxy[fpos]) :
-
-                        % two loners
-
-                        multipar := if obey_multi_par_hang :
-
-                            _pmp_right_bottom_hang_(true) --
-                            _pmp_right_top_hang_(true) --
-                            _pmp_snapped_multi_pos_(urxy[fpos]) --
-                            lrxy[fpos] --
-
-                        else :
-
-                            llxy[fpos] --
-                            (xpart urcorner multipar, ypart llxy[fpos]) --
-                            (xpart urcorner multipar, ypart ulxy[fpos]) --
-                            _pmp_snapped_multi_pos_(ulxy[fpos]) --
-
-                        fi cycle ;
-
-                        save_multipar (i,1,multipar) ;
-
-                        multipar := _pmp_set_multipar_(i) ;
-
-                        multipar := if obey_multi_par_hang :
-
-                            _pmp_left_bottom_hang_(true) --
-                            llxy[tpos] --
-                            _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                            _pmp_left_top_hang_(true) --
-
-                        else :
-
-                            (xpart llcorner multipar, ypart llxy[tpos]) --
-                            llxy[tpos] --
-                            _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                            (xpart llcorner multipar, ypart ulxy[tpos]) --
-
-                        fi cycle ;
-
-                        save_multipar (i,1,multipar) ;
-
-                    else :
-
-                        multipar := if obey_multi_par_hang :
-
-                            _pmp_left_bottom_hang_(true) --
-                            llxy[tpos] --
-                            _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                            _pmp_right_bottom_hang_(true) --
-                            _pmp_right_top_hang_(true) --
-                            _pmp_snapped_multi_pos_(urxy[fpos]) --
-                            lrxy[fpos] --
-                            _pmp_left_top_hang_(true) --
-
-                        else :
-
-                            (xpart llcorner multipar, ypart llxy[tpos]) --
-                            llxy[tpos] --
-                            _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                            (xpart lrcorner multipar, ypart ulxy[tpos]) --
-                            (xpart urcorner multipar, ypart urxy[fpos]) --
-                            _pmp_snapped_multi_pos_(urxy[fpos]) --
-                            lrxy[fpos] --
-                            (xpart ulcorner multipar, ypart lrxy[fpos]) --
-
-                        fi cycle  ;
-
-                        save_multipar (i,1,multipar) ;
-
-                    fi ;
-
-                else :
-
-                    multipar := if obey_multi_par_hang :
-
-                        _pmp_left_bottom_hang_(false) --
-                        _pmp_right_bottom_hang_(false) --
-                        _pmp_right_top_hang_(false) --
-                        _pmp_snapped_multi_pos_(urxy[fpos]) --
-                        lrxy[fpos] --
-                        _pmp_left_top_hang_(false) --
-
-                    else :
-
-                        llcorner multipar --
-                        lrcorner multipar --
-                        (xpart urcorner multipar, ypart urxy[fpos]) --
-                        _pmp_snapped_multi_pos_(urxy[fpos]) --
-                        lrxy[fpos] --
-                        (xpart ulcorner multipar, ypart lrxy[fpos]) --
-
-                    fi cycle ;
-
-                    save_multipar (i,1,multipar) ;
-
-                fi ;
-
-            elseif (nxy[tpos]=RealPageNumber) and (InsideTextArea(i,par_stop_pos)) :
-
-                % last one in chain
-
-                nn := i ;
-
-                if obey_multi_par_hang and obey_multi_par_more :
-
-                    multipar :=
-                        _pmp_x_left_top_hang_(i,true) --
-                        _pmp_x_right_top_hang_(i,true) --
-                        _pmp_x_right_bottom_hang_(i,true) --
-                        _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                        llxy[tpos] --
-                        _pmp_x_left_bottom_hang_(i,true) --
-                        cycle ;
-
-                else :
-
-                    multipar :=
-                        ulcorner multipar --
-                        urcorner multipar --
-                        (xpart lrcorner multipar, ypart urxy[tpos]) --
-                        _pmp_snapped_multi_pos_(ulxy[tpos]) --
-                        llxy[tpos] --
-                        (xpart llcorner multipar, ypart llxy[tpos]) --
-                        cycle ;
-
-                fi ;
-
-                save_multipar (i,3,multipar) ;
-
-            elseif multi_column_first_page_hack and ((nxy[fpos]=RealPageNumber) and (nxy[tpos]>=RealPageNumber) and (NOfTextColumns>1)) :
-
-                save_multipar (i,2,multipar) ;
-
-            else :
-                % handled later
-            fi ;
-
-        endfor ;
-
-
-        % second loop
-
-        if force_multi_par_chain or (ii > 1) :
-
-            for i=ii+1 upto nn-1 :
-
-                % rest of chain / todo : hang
-
-                % hm, the second+ column in column sets now gets lost in a NOfTextColumns
-
-                if (not check_multi_par_chain) or ((nxy[fpos]<RealPageNumber) and (nxy[tpos]>RealPageNumber)) :
-
-                    multipar := _pmp_set_multipar_(i) ;
-
-                    if obey_multi_par_hang and obey_multi_par_more :
-
-                        multipar :=
-                            _pmp_x_left_top_hang_(i,false) --
-                            _pmp_x_right_top_hang_(i,false) --
-                            _pmp_x_right_bottom_hang_(i,false) --
-                            _pmp_x_left_bottom_hang_(i,false) --
-                            cycle ;
-
-                    fi ;
-
-                    save_multipar(i,2,multipar) ;
-
-                fi ;
-
-            endfor ;
-
-        fi ;
-
-        % end of normal/fallback
-
-    fi ;
-
-    if span_multi_column_pars :
-        endgroup ;
-    fi ;
-
-    % potential safeguard:
-
-    % for i=1 upto nofmultipars :
-    %     if length p <= 4 :
-    %         multipars[i] := boundingbox(multipars[i]) ;
-    %     fi ;
-    % end ;
-
-    % quick hack for gb:
-
-    one_piece_multi_par := (nofmultipars=1) and (pn=tn) ;
-
-enddef ;
-
-def boxgridoptions = withcolor .8red   enddef ;
-def boxlineoptions = withcolor .8blue  enddef ;
-def boxfilloptions = withcolor .8white enddef ;
-
-numeric boxgridtype      ; boxgridtype      := 0 ;
-numeric boxlinetype      ; boxlinetype      := 1 ;
-numeric boxfilltype      ; boxfilltype      := 1 ;
-numeric boxdashtype      ; boxdashtype      := 0 ;
-pair    boxgriddirection ; boxgriddirection := up ;
-numeric boxgridwidth     ; boxgridwidth     := 1pt ;
-numeric boxlinewidth     ; boxlinewidth     := 1pt ;
-numeric boxlineradius    ; boxlineradius    := 0pt ;
-numeric boxfilloffset    ; boxfilloffset    := 0pt ;
-numeric boxgriddistance  ; boxgriddistance  := .5cm ;
-numeric boxgridshift     ; boxgridshift     := 0pt ;
-
-% def draw_box =
-%     draw pxy        boxlineoptions withpen pencircle scaled boxlinewidth ;
-%     draw lxy -- rxy boxlineoptions withpen pencircle scaled boxgridwidth ;
-% enddef ;
-
-def draw_par  = % 1 2 3 11 12
-    do_draw_par(pxy) ; do_draw_par(txy) ; do_draw_par(bxy) ;
-    for i = pxy, txy, bxy :
-        if boxgridtype = 1 :
-            boxgriddirection := origin ;
-            draw baseline_grid (i,boxgriddirection,true ) boxgridoptions ;
-        elseif boxgridtype = 2 :
-            boxgriddirection := origin ;
-            draw baseline_grid (i,boxgriddirection,false) boxgridoptions ;
-        elseif boxgridtype = 3 :
-            boxgriddirection := origin ;
-            draw baseline_grid (i,boxgriddirection,true ) boxgridoptions ;
-            draw baseline_grid (i,boxgriddirection,true ) shifted (0,ExHeight) boxgridoptions ;
-        elseif boxgridtype = 4 :
-            boxgriddirection := origin ;
-            draw baseline_grid (i,boxgriddirection,true ) shifted (0,ExHeight/2) boxgridoptions ;
-        elseif boxgridtype = 11 :
-            draw graphic_grid(i,boxgriddistance,boxgriddistance,boxgriddistance/2,boxgriddistance/2) ;
-        elseif boxgridtype = 12 :
-            draw graphic_grid(i,boxgriddistance,boxgriddistance,0,0) ;
-        fi ;
-    endfor ;
-enddef ;
-
-def do_show_par (expr p, r, c) =
-    if length(p) > 2 :
-        for i=0 upto length(p) :
-            draw fullcircle scaled r shifted point i of p withpen pencircle scaled .5pt withcolor c ;
-        endfor ;
-    fi ;
-    draw p withpen pencircle scaled .5pt withcolor c ;
-enddef ;
-
-def show_par  =
-    if length(mxy) > 2 :
-        draw mxy dashed evenly withpen pencircle scaled .5pt withcolor .5white ;
-    fi ;
-    do_show_par(txy, 4pt, .5green) ;
-    do_show_par(bxy, 6pt, .5blue ) ;
-    do_show_par(pxy, 8pt, .5red  ) ;
-    draw pref withpen pencircle scaled 2pt ;
-enddef ;
-
-def sort_multi_pars =
-    if nofmultipars>1 :
-        begingroup ;
-        save _p_, _n_ ; path _p_ ; numeric _n_ ;
-        for i := 1 upto nofmultipars :
-            if multilocs[i] = 3 :
-                _p_ := multipars[nofmultipars] ;
-                multipars[nofmultipars] := multipars[i] ;
-                multipars[i] := _p_ ;
-                _n_ := multirefs[nofmultipars] ;
-                multirefs[nofmultipars] := multirefs[i] ;
-                multirefs[i] := _n_ ;
-                _n_ := multilocs[nofmultipars] ;
-                multilocs[nofmultipars] := multilocs[i] ;
-                multilocs[i] := _n_ ;
-            fi ;
-        endfor ;
-        endgroup ;
-    fi ;
-enddef ;
-
-def collapse_multi_pars =
-    if nofmultipars>1 :
-        begingroup ;
-        save _nofmultipars_ ; numeric _nofmultipars_ ;
-        _nofmultipars_ := 1 ;
-        sort_multi_pars ; % block not in order: 1, 3, 2....
-        for i:=1 upto nofmultipars-1 :
-            if (round(xpart(llcorner multipars[i]-llcorner multipars[i+1]))=0) and
-               (round(xpart(lrcorner multipars[i]-lrcorner multipars[i+1]))=0) :
-                multilocs[_nofmultipars_] := multilocs[i+1] ;
-                multirefs[_nofmultipars_] := multirefs[i+1] ;
-                multipars[_nofmultipars_] :=
-                    ulcorner multipars[_nofmultipars_] --
-                    urcorner multipars[_nofmultipars_] --
-                    lrcorner multipars[i+1] --
-                    llcorner multipars[i+1] -- cycle ;
-            else :
-                _nofmultipars_ := _nofmultipars_ + 1 ;
-                multipars[_nofmultipars_] := multipars[i+1] ;
-                multilocs[_nofmultipars_] := multilocs[i+1] ;
-                multirefs[_nofmultipars_] := multirefs[i+1] ;
-            fi  ;
-        endfor ;
-        nofmultipars := _nofmultipars_ ;
-        endgroup ;
-    fi ;
-enddef ;
-
-def draw_multi_pars  =
-    for i=1 upto nofmultipars :
-        do_draw_par(multipars[i]) ;
-        if boxgridtype= 1 :
-            draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) ;
-        elseif boxgridtype= 2 :
-            draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,false) ;
-        elseif boxgridtype= 3 :
-            draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) ;
-            draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight) ;
-        elseif boxgridtype= 4 :
-            draw baseline_grid (multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight/2) ;
-        elseif boxgridtype=11 :
-            draw graphic_grid(multipars[i],boxgriddistance,boxgriddistance,boxgriddistance/2,boxgriddistance/2) ;
-        elseif boxgridtype=12 :
-            draw graphic_grid(multipars[i],boxgriddistance,boxgriddistance,0,0) ;
-        fi ;
-    endfor ;
-enddef ;
-
-def show_multi_pars  =
-    for i=1 upto nofmultipars :
-        do_show_par(multipars[i], 6pt, .5blue) ;
-    endfor ;
-enddef ;
-
-vardef do_draw_par (expr p) =
-    if (length p>2) and (bbwidth(p)>1) and (bbheight(p)>1) :
-        save pp ; path pp ;
-        if (boxlineradius>0) and (boxlinetype=2) :
-            pp := p cornered boxlineradius ;
-        else :
-            pp := p ;
-        fi ;
-        if boxfilltype>0 :
-            if boxfilloffset>0 :
-                % temporary hack
-                begingroup ;
-                interim linejoin := mitered ;
-                filldraw pp boxfilloptions withpen pencircle scaled (2*boxfilloffset) ;
-                endgroup ;
-            else :
-                fill pp boxfilloptions ;
-            fi ;
-        fi ;
-        if boxlinetype>0 :
-            draw pp boxlineoptions withpen pencircle scaled boxlinewidth ;
-        fi ;
-    fi ;
-enddef ;
-
-vardef baseline_grid (expr pxy, pdir, at_baseline) =
-    save width ; width := bbwidth(pxy) ;
-    save height ; height := bbheight(pxy) ;
-    if (par_line_height>0) and (height>1) and (width>1) and (boxgridwidth>0) :
-        save i, grid, bb ; picture grid ; pair start ; path bb ;
-        def _do_ (expr start) =
-            % 1 = normal, 2 = with background (i.e. no shine-through)
-            if boxdashtype = 2 :
-                draw start -- start shifted (width,0)
-                    withpen pencircle scaled boxgridwidth
-                    boxfilloptions ;
-            fi ;
-            draw start -- start shifted (width,0)
-                if boxdashtype > 0 :
-                    dashed evenly
-                fi
-                withpen pencircle scaled boxgridwidth
-                boxgridoptions ;
-        enddef ;
-        grid := image ( % fails with inlinespace
-            if pdir=up :
-                for i = if at_baseline : par_strut_depth else : 0 fi step  par_line_height until max(height,par_line_height) :
-                    _do_ (llcorner pxy shifted (0,+i)) ;
-                endfor ;
-            else :
-                for i = if at_baseline : par_strut_height else : 0 fi step  par_line_height until height :
-                    _do_ (ulcorner pxy shifted (0,-i)) ;
-                endfor ;
-            fi ;
-        ) ;
-        clip grid to pxy ;
-        bb := boundingbox grid ;
-        grid := grid shifted (0,boxgridshift) ;
-        setbounds grid to bb ;
-        grid
-    else :
-        nullpicture
-    fi
-enddef ;
-
-vardef graphic_grid (expr pxy, dx, dy, x, y) =
-    if (bbheight(pxy)>dy) and (bbwidth(pxy)>dx) and (boxgridwidth>0) :
-        save grid ; picture grid ;
-        grid := image (
-            for i = xpart llcorner pxy step dx until xpart lrcorner pxy :
-                draw (i,ypart llcorner pxy) -- (i,ypart ulcorner pxy) withpen pencircle scaled boxgridwidth ;
-            endfor ;
-            for i = ypart llcorner pxy step dy until ypart ulcorner pxy :
-                draw (xpart llcorner pxy,i) -- (xpart lrcorner pxy,i) withpen pencircle scaled boxgridwidth ;
-            endfor
-        ) shifted (x,y) ;
-        clip grid to pxy ;
-        grid
-    else :
-        nullpicture
-    fi
-enddef ;
-
-def anchor_box (expr n,x,y,w,h,d) =
-    currentpicture := currentpicture shifted (-x,-y) ;
-enddef ;
-
-let draw_area   = draw_box ;
-let anchor_area = anchor_box ;
-let anchor_par  = anchor_box ;
-
-numeric sync_n[], sync_p[][], sync_w[][], sync_h[][], sync_d[][], sync_t[][] ;
-pair sync_xy[][] ; color sync_c[][] ;
-
-def ResetSyncTasks =
-    path SyncPaths[] ; numeric SyncTasks[], NOfSyncPaths, CurrentSyncClass ;
-    NOfSyncPaths := CurrentSyncClass := 0 ;
-    if unknown SyncLeftOffset : numeric SyncLeftOffset ; SyncLeftOffset := 0          ; fi ;
-    if unknown SyncWidth      : numeric SyncWidth      ; SyncWidth      := 0          ; fi ;
-    if unknown SyncThreshold  : numeric SyncThreshold  ; SyncThreshold  := LineHeight ; fi ;
-    if unknown SyncColor      : color   SyncColor      ; SyncColor      := .5white    ; fi ;
-    if (SyncLeftOffset = 0) and (SyncWidth = 0) :
-        SyncWidth := if known TextWidth : TextWidth else : -1cm fi ;
-    fi ;
-enddef ;
-
-ResetSyncTasks ;
-
-vardef SyncBox(expr n, i, leftoffset, width, topoffset, bottomoffset) =
-    save o ; pair o ; o := (xpart llcorner PlainTextArea,ypart sync_xy[n][i]) ;
-    o shifted (leftoffset,sync_h[n][i]+topoffset) --
-    o shifted (width+leftoffset,sync_h[n][i]+topoffset) --
-    o shifted (width+leftoffset,bottomoffset) --
-    o shifted (leftoffset,bottomoffset) -- cycle
-enddef ;
-
-def SetSyncColor(expr n, i, c) =
-    sync_c[n][i] := c ;
-enddef ;
-
-def SetSyncThreshold(expr n, i, th) =
-    sync_th[n][i] := th ;
-enddef ;
-
-vardef TheSyncColor(expr n, i) =
-    if known sync_c[n][i] : sync_c[n][i] else : SyncColor fi
-enddef ;
-
-vardef TheSyncThreshold(expr n, i) =
-    if known sync_th[n][i] : sync_th[n][i] else : SyncThreshold fi
-enddef ;
-
-vardef PrepareSyncTasks(expr n, collapse, extendtop, prestartnext) =
-    ResetSyncTasks ;
-    if known sync_n[n] :
-        CurrentSyncClass := n ;
-        save ok, l, d ; boolean ok ; ok := false ; NOfSyncPaths := l := 0 ;
-        for i=1 upto sync_n[n] :
-            if RealPageNumber > sync_p[n][i] :
-                l := i ;
-            elseif RealPageNumber = sync_p[n][i] :
-                NOfSyncPaths := NOfSyncPaths + 1 ;
-                if not ok :
-                    if i>1 :
-                        if sync_t[n][i-1] = sync_t[n][i] :
-                            SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, PaperHeight, -PaperHeight) ;
-                            SyncTasks[NOfSyncPaths] := i ;
-                        else :
-                            SyncPaths[NOfSyncPaths] := SyncBox(n, i-1, SyncLeftOffset, SyncWidth, PaperHeight, -PaperHeight) ;
-                            SyncTasks[NOfSyncPaths] := i-1 ;
-                            NOfSyncPaths := NOfSyncPaths + 1 ;
-                            SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, 0, -PaperHeight) ;
-                            SyncTasks[NOfSyncPaths] := i ;
-                        fi ;
-                    else :
-                        SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, 0, -PaperHeight) ;
-                        SyncTasks[NOfSyncPaths] := i ;
-                    fi ;
-                else :
-                    SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, 0, -PaperHeight) ;
-                    SyncTasks[NOfSyncPaths] := i ;
-                fi ;
-                ok := true ;
-            fi ;
-        endfor ;
-        if (NOfSyncPaths = 0) and (l > 0) :
-            NOfSyncPaths := 1 ;
-            SyncPaths[NOfSyncPaths] := SyncBox(n, l, SyncLeftOffset, SyncWidth, PaperHeight, -PaperHeight) ;
-            SyncTasks[NOfSyncPaths] := l ;
-        fi ;
-        if NOfSyncPaths > 0 :
-            for i = 1 upto NOfSyncPaths-1 :
-                SyncPaths[i] := topboundary SyncPaths[i] -- reverse topboundary SyncPaths[i+1] -- cycle ;
-            endfor ;
-            if unknown SyncThresholdMethod :
-                numeric SyncThresholdMethod ; SyncThresholdMethod := 2 ;
-            fi ;
-            if extendtop :
-                if SyncThresholdMethod = 1 :
-                    if NOfSyncPaths>1 :
-                        d := ypart (ulcorner PlainTextArea - sync_xy[n][SyncTasks[2]]) ;
-                        if (SyncTasks[2]>1) and (d > 0pt) and (d <= TheSyncThreshold(n,sync_t[n][SyncTasks[2]])) and (sync_p[n][SyncTasks[2]] = RealPageNumber) :
-                            SyncPaths[2] := SyncPaths[2] topenlarged PaperHeight ;
-                        fi ;
-                    fi ;
-                else :
-                    for i = 1 upto NOfSyncPaths :
-                        d := ypart (ulcorner PlainTextArea - sync_xy[n][SyncTasks[i]]) ;
-                        if (d > 0) and (d <= TheSyncThreshold(n,sync_t[n][SyncTasks[i]])) and (sync_p[n][SyncTasks[i]] = RealPageNumber) :
-                            SyncPaths[i] := SyncPaths[i] topenlarged PaperHeight ;
-                        fi ;
-                    endfor ;
-                fi ;
-            fi ;
-            if prestartnext :
-                if NOfSyncPaths>1 :
-                    if SyncTasks[NOfSyncPaths] < sync_n[n] : % there is a next one
-                        d := ypart (ulcorner PlainTextArea - sync_xy[n][SyncTasks[NOfSyncPaths]+1]) ;
-                        if (d > 0) and (d <= TheSyncThreshold(n, sync_t[n][SyncTasks[i]])) and (sync_p[n][SyncTasks[NOfSyncPaths]+1] = RealPageNumber+1) :
-                            SyncPaths[NOfSyncPaths+1] :=
-                                (xpart ulcorner SyncPaths[NOfSyncPaths],ypart llcorner PlainTextArea) --
-                                (xpart urcorner SyncPaths[NOfSyncPaths],ypart llcorner PlainTextArea) --
-                                lrcorner SyncPaths[NOfSyncPaths] --
-                                llcorner SyncPaths[NOfSyncPaths] -- cycle ;
-                            SyncTasks[NOfSyncPaths+1] := SyncTasks[NOfSyncPaths]+1 ;
-                            NOfSyncPaths := NOfSyncPaths + 1 ;
-                        fi ;
-                    fi ;
-                fi ;
-            else :
-                if NOfSyncPaths>1 :
-                    d := ypart (sync_xy[n][SyncTasks[NOfSyncPaths]] - llcorner PlainTextArea) ;
-                    if (d < TheSyncThreshold(n, SyncTasks[NOfSyncPaths])) :
-                        NOfSyncPaths := NOfSyncPaths - 1 ;
-                        SyncPaths[NOfSyncPaths] := SyncPaths[NOfSyncPaths] bottomenlarged PaperHeight ;
-                    fi ;
-                fi ;
-            fi ;
-            if (NOfSyncPaths>1) and collapse :
-                save j ; numeric j ; j := 1 ;
-                for i = 2 upto NOfSyncPaths :
-                    if sync_t[n][SyncTasks[i]] = sync_t[n][SyncTasks[j]] :
-                        SyncPaths[j] := boundingbox image (draw SyncPaths[i] ; draw SyncPaths[j] ; ) ;
-                        SyncTasks[j] := SyncTasks[i] ;
-                    else :
-                        j := j + 1 ;
-                        SyncPaths[j] := SyncPaths[i] ;
-                        SyncTasks[j] := SyncTasks[i] ;
-                    fi ;
-                endfor ;
-                NOfSyncPaths := j ;
-            fi ;
-        fi ;
-    fi ;
-enddef ;
-
-def SyncTask(expr n) =
-    if known SyncTasks[n] : SyncTasks[n] else : 0 fi
-enddef ;
-
-def FlushSyncTasks =
-    for i = 1 upto NOfSyncPaths :
-        ProcessSyncTask(SyncPaths[i], TheSyncColor(CurrentSyncClass,sync_t[CurrentSyncClass][SyncTasks[i]])) ;
-    endfor ;
-enddef ;
-
-def ProcessSyncTask(expr p, c) =
-    fill p withcolor c ;
-enddef ;
diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv
index 903438b72..e2f59acfd 100644
--- a/metapost/context/base/mpiv/mp-tool.mpiv
+++ b/metapost/context/base/mpiv/mp-tool.mpiv
@@ -3159,6 +3159,15 @@ def endglyph =
     endfig ;
 enddef ;
 
+def beginfont(expr name) =
+    begingroup;
+    passvariable("fontname",name) ;
+enddef ;
+
+def endfont =
+    endgroup;
+enddef ;
+
 %D Dimensions have never been an issue as traditional MP can't make that large
 %D pictures, but with double mode we need a catch:
 
diff --git a/metapost/context/base/mpxl/metafun.mpxl b/metapost/context/base/mpxl/metafun.mpxl
index ea9c8a791..2c21110de 100644
--- a/metapost/context/base/mpxl/metafun.mpxl
+++ b/metapost/context/base/mpxl/metafun.mpxl
@@ -15,32 +15,47 @@
 %D prevent dependency problems and in the end even may use a patched version,
 %D we prefer to use a copy.
 
-boolean contextlmtxmode ; contextlmtxmode := if known fontmaking : false else: true fi;
+% We only get a callback when the property > 0
 
-input "mp-base.mpiv" ;
-input "mp-tool.mpiv" ;
+def primitive = setproperty  1 : enddef; % not to be used
+def permanent = setproperty  2 : enddef;
+def immutable = setproperty  3 : enddef;
+def frozen    = setproperty  4 : enddef; % not yet used
+def mutable   = setproperty -3 : enddef; % not yet used
+
+permanent permanent, immutable, mutable, primitive, frozen ; % we reserve frozen
+
+boolean contextlmtxmode ; contextlmtxmode := true ; immutable contextlmtxmode ;
+
+% But it will move here:
+
+input "mp-base.mpxl" ;
+input "mp-tool.mpxl" ;
 input "mp-luas.mpxl" ;
 input "mp-mlib.mpxl" ;
 input "mp-math.mpxl" ;
 input "mp-cont.mpxl" ;
 input "mp-page.mpxl" ;
-input "mp-butt.mpiv" ;
-input "mp-shap.mpiv" ;
-input "mp-grph.mpiv" ;
-input "mp-grid.mpiv" ;
-input "mp-form.mpiv" ;
-input "mp-figs.mpiv" ;
-input "mp-func.mpiv" ;
-input "mp-node.mpiv" ;
-input "mp-apos.mpiv" ;
-input "mp-abck.mpiv" ;
-input "mp-blob.mpiv" ;
-
-input "mp-lmtx.mpxl" ; % playground, not official
+input "mp-butt.mpxl" ;
+input "mp-shap.mpxl" ;
+input "mp-grph.mpxl" ;
+input "mp-grid.mpxl" ;
+input "mp-form.mpxl" ;
+input "mp-figs.mpxl" ;
+input "mp-func.mpxl" ;
+input "mp-node.mpxl" ;
+input "mp-apos.mpxl" ;
+input "mp-abck.mpxl" ;
+input "mp-blob.mpxl" ;
+input "mp-lmtx.mpxl" ;
 
 string metafunversion ; metafunversion = "metafun xl " & mfun_timestamp;
 
+immutable metafunversion ;
+
 let normalend = end ;
 
 def end = ; message "" ; message metafunversion ; message "" ; endinput  ; enddef ;
 def bye = ; message "" ; message metafunversion ; message "" ; endinput  ; enddef ;
+
+overloadmode := 1 ;
diff --git a/metapost/context/base/mpxl/minifun.mpxl b/metapost/context/base/mpxl/minifun.mpxl
index 70ec72a82..8da5f1d37 100644
--- a/metapost/context/base/mpxl/minifun.mpxl
+++ b/metapost/context/base/mpxl/minifun.mpxl
@@ -14,18 +14,23 @@
 %D This is a minimal \METAFUN\ instance which can be handy for isolated
 %D subruns.
 
-boolean contextlmtxmode ; contextlmtxmode := if known fontmaking : false else: true fi;
+def primitive = setproperty  1 : enddef; % not to be used
+def permanent = setproperty  2 : enddef;
+def immutable = setproperty  3 : enddef;
+def frozen    = setproperty  4 : enddef; % not yet used
+def mutable   = setproperty -3 : enddef; % not yet used
 
-prologues := 0 ;
-mpprocset := 1 ;
+permanent permanent, immutable, mutable, primitive, frozen ; % we reserve frozen
+
+boolean contextlmtxmode ; contextlmtxmode := true ; immutable contextlmtxmode ;
 
 input "mp-base.mpiv" ;
-input "mp-tool.mpiv" ;
+input "mp-tool.mpxl" ;
 input "mp-mlib.mpxl" ;
 input "mp-luas.mpxl" ;
 input "mp-math.mpxl" ;
 input "mp-cont.mpxl" ;
-input "mp-page.mpiv" ;
+input "mp-page.mpxl" ;
 
 string minifunversion ; minifunversion = "minifun xl " & mfun_timestamp;
 
diff --git a/metapost/context/base/mpxl/mp-abck.mpxl b/metapost/context/base/mpxl/mp-abck.mpxl
new file mode 100644
index 000000000..650a76ebb
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-abck.mpxl
@@ -0,0 +1,291 @@
+%D \module
+%D   [       file=mp-abck.mpiv,
+%D        version=2012.02.19, % was mp-core: 1999.08.01, anchoring
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=anchored background macros,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+if known context_abck : endinput ; fi ;
+
+boolean context_abck ; context_abck := true ; immutable context_abck ;
+
+path    multiregs[],    % region used for multipar (tracing only)
+        multipars[],    % effective area (shape)
+        multibox ;      % main boundingbox (of main region)
+
+string  multikind[] ;   % region state: single | first | middle | last (new method)
+
+numeric multilocs[],    % 1=begin 2=between 3=end (old method)
+        nofmultipars ;  % number of calculated areas
+
+numeric par_strut_height,
+        par_strut_depth,
+        par_line_height ;
+
+nofmultipars     := 0 ;
+par_strut_height := 0 ;
+par_strut_depth  := 0 ;
+par_line_height  := 0 ;
+
+def boxgridoptions = withcolor .8red   enddef ;
+def boxlineoptions = withcolor .8blue  enddef ;
+def boxfilloptions = withcolor .8white enddef ;
+
+numeric boxgridtype      ; boxgridtype      := 0 ;
+numeric boxlinetype      ; boxlinetype      := 1 ;
+numeric boxfilltype      ; boxfilltype      := 1 ;
+numeric boxdashtype      ; boxdashtype      := 0 ;
+pair    boxgriddirection ; boxgriddirection := up ;
+numeric boxgridwidth     ; boxgridwidth     := 1pt ;
+numeric boxlinewidth     ; boxlinewidth     := 1pt ;
+numeric boxlineradius    ; boxlineradius    := 0 ;
+numeric boxlineoffset    ; boxlineoffset    := 0 ;
+numeric boxfilloffset    ; boxfilloffset    := 0 ;
+numeric boxgriddistance  ; boxgriddistance  := .5cm ;
+numeric boxgridshift     ; boxgridshift     := 0 ;
+
+permanent multipars, multiregs, multibox, multikind, multilocs, nofmultipars ;
+
+vardef abck_draw_path(expr p) =
+    if (length p > 2) and (bbwidth(p) > 1) and (bbheight(p) > 1) :
+        save pp ; path pp ;
+        pp := p if (boxlineradius>0) and (boxlinetype=2) : cornered boxlineradius fi ;
+        if boxfilltype > 0 :
+            if boxfilloffset > 0 :
+                interim linejoin := mitered ;
+                filldraw pp boxfilloptions withpen pencircle scaled (2*boxfilloffset) ;
+            else :
+                fill pp boxfilloptions ;
+            fi ;
+        fi ;
+        if boxlinetype > 0 :
+            draw pp boxlineoptions withpen pencircle scaled boxlinewidth ;
+        fi ;
+    fi ;
+enddef ;
+
+def abck_grid_line(expr start, width) =
+    % 1 = normal, 2 = with background (i.e. no shine-through)
+    if boxdashtype = 2 :
+        draw start -- start shifted (width,0)
+            withpen pencircle scaled boxgridwidth
+            boxfilloptions ;
+    fi ;
+    draw start -- start shifted (width,0)
+        if boxdashtype > 0 :
+            dashed evenly
+        fi
+        withpen pencircle scaled boxgridwidth
+        boxgridoptions ;
+enddef ;
+
+vardef abck_baseline_grid(expr pxy, pdir, at_baseline) =
+    save width ; width := bbwidth(pxy) ;
+    save height ; height := bbheight(pxy) ;
+    if (par_line_height > 0) and (height > 1) and (width > 1) and (boxgridwidth > 0) :
+        save i, grid, bb ; picture grid ; pair start ; path bb ;
+        grid := image ( % fails with inlinespace
+            if pdir = up :
+                for i = if at_baseline : par_strut_depth else : 0 fi step par_line_height until max(height,par_line_height) :
+                    abck_grid_line(llcorner pxy shifted (0,+i),width) ;
+                endfor ;
+            else :
+                for i = if at_baseline : par_strut_height else : 0 fi step par_line_height until height :
+                    abck_grid_line(ulcorner pxy shifted (0,-i),width) ;
+                endfor ;
+            fi ;
+        ) ;
+        clip grid to pxy ;
+        bb := boundingbox grid ;
+        grid := grid shifted (0,boxgridshift) ;
+        setbounds grid to bb ;
+        grid
+    else :
+        nullpicture
+    fi
+enddef ;
+
+vardef abck_graphic_grid(expr pxy, dx, dy, x, y) =
+    if (bbheight(pxy) > dy) and (bbwidth(pxy) > dx) and (boxgridwidth > 0) :
+        save grid ; picture grid ;
+        grid := image (
+            for i = xpart llcorner pxy step dx until xpart lrcorner pxy :
+                draw (i,ypart llcorner pxy) -- (i,ypart ulcorner pxy) withpen pencircle scaled boxgridwidth ;
+            endfor ;
+            for i = ypart llcorner pxy step dy until ypart ulcorner pxy :
+                draw (xpart llcorner pxy,i) -- (xpart lrcorner pxy,i) withpen pencircle scaled boxgridwidth ;
+            endfor
+        ) shifted (x,y) ;
+        clip grid to pxy ;
+        grid
+    else :
+        nullpicture
+    fi
+enddef ;
+
+def draw_multi_pars =
+    for i=1 upto nofmultipars :
+        abck_draw_path(multipars[i]) ;
+        if boxgridtype = 1 :
+            draw abck_baseline_grid(multipars[i],if multilocs[i]=1: down else: up fi,true) ;
+        elseif boxgridtype = 2 :
+            draw abck_baseline_grid(multipars[i],if multilocs[i]=1: down else: up fi,false) ;
+        elseif boxgridtype = 3 :
+            draw abck_baseline_grid(multipars[i],if multilocs[i]=1: down else: up fi,true) ;
+            draw abck_baseline_grid(multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight) ;
+        elseif boxgridtype = 4 :
+            draw abck_baseline_grid(multipars[i],if multilocs[i]=1: down else: up fi,true) shifted (0,ExHeight/2) ;
+        elseif boxgridtype = 11 :
+            draw abck_graphic_grid(multipars[i],boxgriddistance,boxgriddistance,boxgriddistance/2,boxgriddistance/2) ;
+        elseif boxgridtype = 12 :
+            draw abck_graphic_grid(multipars[i],boxgriddistance,boxgriddistance,0,0) ;
+        fi ;
+    endfor ;
+enddef ;
+
+def show_multi_pars =
+    for i=1 upto nofmultipars :
+        drawpathwithpoints multipars[i] withcolor .5blue ;
+    endfor ;
+enddef ;
+
+def show_multi_kind =
+    for i=1 upto nofmultipars :
+        fill multipars[i]
+            withcolor
+                if      multikind[i] = "single" : yellow
+                elseif  multikind[i] = "first"  : red
+                elseif  multikind[i] = "middle" : green
+                elseif  multikind[i] = "last"   : blue
+                fi
+            withtransparency (1,.5)
+        ;
+    endfor ;
+enddef ;
+
+def multi_side_draw_options = enddef ;
+
+def draw_multi_side =
+    begingroup ; save p ; picture p ;
+    for i=1 upto nofmultipars :
+        p := image ( fill leftboundary multipars[i]
+            shifted (-boxlineoffset,0)
+            rightenlarged boxlinewidth boxlineoptions ;
+        ) ;
+        setbounds p to multipars[i] ;
+        draw p ;
+    endfor ;
+    endgroup ;
+enddef ;
+
+def draw_multi_side_path text t =
+    begingroup ; save p ; picture p ;
+    for i=1 upto nofmultipars :
+        p := image ( draw leftboundary multipars[i]
+            shifted (-boxlineoffset,0)
+            withpen pensquare scaled boxlinewidth boxlineoptions t ;
+        ) ;
+        setbounds p to multipars[i] ;
+        draw p ;
+    endfor ;
+    endgroup ;
+enddef ;
+
+% some extras
+
+% For the moment we keep these as they can be in use but they will disappear.
+
+pair    lxy[], rxy[], cxy[], llxy[], lrxy[], ulxy[], urxy[] ;
+path    pxy[] ;
+numeric hxy[], wxy[], dxy[], nxy[] ;
+
+def box_found (expr n,x,y,w,h,d) =
+    not ((x=0) and (y=0) and (w=0) and (h=0) and (d=0))
+enddef ;
+
+def initialize_box_pos (expr pos,n,x,y,w,h,d) =
+    pair lxy, rxy, cxy, llxy, lrxy, ulxy, urxy ;
+    path pxy ; numeric hxy, wxy, dxy, nxy;
+    lxy  := (x,y) ;
+    llxy := (x,y-d) ;
+    lrxy := (x+w,y-d) ;
+    urxy := (x+w,y+h) ;
+    ulxy := (x,y+h) ;
+    wxy  := w ;
+    hxy  := h ;
+    dxy  := d ;
+    rxy  := lxy shifted (wxy,0) ;
+    pxy  := llxy--lrxy--urxy--ulxy--cycle ;
+    cxy  := center pxy ;
+    nxy  := n ;
+    freeze_box(pos) ;
+enddef ;
+
+def freeze_box (expr pos) =
+    lxy[pos]  := lxy  ;
+    llxy[pos] := llxy ;
+    lrxy[pos] := lrxy ;
+    urxy[pos] := urxy ;
+    ulxy[pos] := ulxy ;
+    wxy[pos]  := wxy  ;
+    hxy[pos]  := hxy  ;
+    dxy[pos]  := dxy  ;
+    rxy[pos]  := rxy  ;
+    pxy[pos]  := pxy  ;
+    cxy[pos]  := cxy  ;
+    nxy[pos]  := nxy  ;
+enddef ;
+
+def initialize_box (expr n,x,y,w,h,d) =
+    numeric bpos ; bpos := 0 ; initialize_box_pos(bpos,n,x,y,w,h,d) ;
+enddef ;
+
+def anchor_box (expr n,x,y,w,h,d) =
+    currentpicture := currentpicture shifted (-x,-y) ;
+enddef ;
+
+def draw_box = % for old times sake
+    draw pxy        boxlineoptions withpen pencircle scaled boxlinewidth ;
+    draw lxy -- rxy boxlineoptions withpen pencircle scaled boxgridwidth ;
+enddef ;
+
+def draw_free_region(expr width, height, depth, loffset, roffset, toffset, boffset) =
+
+    begingroup ; save b, o, l ; path b, o, l[] ; save d ;
+
+    b := fullsquare
+        xysized(width,height+depth) ;
+    o := b
+        topenlarged    toffset
+        bottomenlarged boffset
+        leftenlarged   loffset
+        rightenlarged  roffset ;
+    d := max(PaperWidth,PaperHeight) ;
+
+    fill o withcolor .5white ;
+    fill b withcolor .7white ;
+
+    interim linecap := butt ;
+
+    l[1] := topboundary    (topboundary    o leftenlarged d rightenlarged  d) ;
+    l[2] := bottomboundary (bottomboundary o leftenlarged d rightenlarged  d) ;
+    l[3] := leftboundary   (leftboundary   o topenlarged  d bottomenlarged d) ;
+    l[4] := rightboundary  (rightboundary  o topenlarged  d bottomenlarged d) ;
+
+    for i=1 upto 4 :
+        draw l[i] withpen pencircle scaled 1bp withcolor white ;
+        draw l[i] withpen pencircle scaled 1bp dashed (evenly scaled 1bp) withcolor black ;
+    endfor ;
+
+    setbounds currentpicture to b ;
+
+    endgroup ;
+
+enddef ;
+
diff --git a/metapost/context/base/mpxl/mp-apos.mpxl b/metapost/context/base/mpxl/mp-apos.mpxl
new file mode 100644
index 000000000..f9c8b28dc
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-apos.mpxl
@@ -0,0 +1,104 @@
+%D \module
+%D   [       file=mp-apos.mpiv,
+%D        version=2012.02.19, % was mp-core: 1999.08.01, anchoring
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=anchored background macros,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+if known context_apos : endinput ; fi ;
+
+boolean context_apos ; context_apos := true ; immutable context_apos ;
+
+path    posboxes[],
+        posregions[] ;
+
+numeric pospages[],
+        nofposboxes ;
+
+nofposboxes := 0 ;
+
+def boxlineoptions = withcolor .8blue  enddef ;
+def boxfilloptions = withcolor .8white enddef ;
+
+permanent posboxes, posregions, pospages, nofposboxes ;
+
+def connect_positions =
+    if nofposboxes = 2 :
+        pickup pencircle scaled boxlinewidth ;
+        path pa ; pa := posboxes[1] enlarged boxlineoffset ;
+        path pb ; pb := posboxes[2] enlarged boxlineoffset ;
+        if pospages[1] = pospages[2] :
+            draw posboxes[1]  boxlineoptions ;
+            path pc ; pc := center pa {up} .. {down} center pb ;
+            pair cc ; cc := (pc intersection_point pa) ;
+            if intersection_found :
+                pc := pc cutbefore cc ;
+                cc := (pc intersection_point pb) ;
+                if intersection_found :
+                    pc := pc cutafter cc ;
+                    drawarrow pc boxlineoptions ;
+                    drawarrow reverse pc boxlineoptions ;
+                fi ;
+            fi ;
+        elseif pospages[1] == RealPageNumber :
+            draw posboxes[1] boxlineoptions ;
+            path pc ; pc := center pa {up} ... {right} urcorner (posregions[1] enlarged (20pt,20pt)) ;
+            pair cc ; cc := (pc intersection_point pa) ;
+            if intersection_found :
+                pc := pc cutbefore cc ;
+                drawarrow pc boxlineoptions ;
+            fi ;
+        elseif pospages[2] == RealPageNumber :
+            draw posboxes[2] boxlineoptions ;
+            path pc ; pc := ulcorner (posregions[2] enlarged (20pt,20pt)) {right} ... {down} center pb ;
+            pair cc ; cc := (pc intersection_point pb) ;
+            if intersection_found :
+                pc := pc cutafter cc ;
+                drawarrow pc boxlineoptions ;
+            fi ;
+        fi ;
+    fi ;
+enddef ;
+
+% anch-bar:
+
+def anch_sidebars_draw (expr firstpage, lastpage, yfirst, ylast, height, depth,
+        x, y, w, h, alternative, distance, linewidth, linecolor, topoffset, bottomoffset) =
+    % beware, we anchor at (x,y)
+    begingroup ;
+    if alternative = 1 :
+        interim linecap := rounded ;
+    else :
+        interim linecap := butt ;
+    fi ;
+    save a, b ; pair a, b ;
+    if firstpage = lastpage :
+        a := (-distance,yfirst+height-y) ;
+        b := (-distance,ylast-depth-y) ;
+    elseif RealPageNumber = firstpage :
+        a := (-distance,yfirst+height-y) ;
+        b := (-distance,0) ;
+    elseif RealPageNumber = lastpage :
+        a := (-distance,h) ;
+        b := (-distance,ylast-depth-y) ;
+    else :
+        a := (-distance,h) ;
+        b := (-distance,0) ;
+    fi ;
+    a := (xpart a, min(ypart a + topoffset,   h)) ;
+    b := (xpart b, max(ypart b - bottomoffset,0)) ;
+    draw
+        a -- b
+        if alternative = 1 :
+            dashed (withdots scaled (linewidth/2))
+        fi
+        withpen pencircle scaled linewidth
+        withcolor linecolor ;
+    endgroup ;
+enddef ;
diff --git a/metapost/context/base/mpxl/mp-base.mpxl b/metapost/context/base/mpxl/mp-base.mpxl
new file mode 100644
index 000000000..df7280186
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-base.mpxl
@@ -0,0 +1,1047 @@
+% This is a reformatted copy of the plain.mp file. We use a copy
+% because (1) we want to make sure that there are no unresolved
+% dependencies, and (2) we may patch this file eventually.
+
+% This file gives the macros for plain MetaPost It contains all the
+% features of plain METAFONT except those specific to font-making.
+% There are also a number of macros for labeling figures, etc.
+
+% For practical reasons I have moved some new code here (and might
+% remove some code as well). After all, there is no development in
+% this format.
+
+string base_name, base_version ;
+
+base_name    := "plain" ;
+base_version := "1.004 for metafun iv and xl"  ;
+
+message "loading metafun, including plain.mp version " & base_version ;
+
+delimiters () ; % this makes parentheses behave like parentheses
+
+def upto   = step  1 until enddef ;
+def downto = step -1 until enddef ;
+
+def exitunless expr c =
+    exitif not c
+enddef ;
+
+let relax = \ ; % ignore the word relax, as in TeX
+let \\    = \ ; % double relaxation is like single
+
+def [[ = [ [ enddef ;
+def ]] = ] ] enddef ;
+
+def --  = {curl 1} .. {curl 1}    enddef ;
+def --- = .. tension infinity ..  enddef ;
+def ... = .. tension atleast 1 .. enddef ;
+
+def          gobble primary g = enddef ;
+primarydef g gobbled gg       = enddef ;
+
+def hide(text t) =
+    exitif numeric begingroup t ; endgroup ;
+enddef ;
+
+def ??? =
+    hide (
+        interim showstopping := 1 ;
+        showdependencies
+    )
+enddef ;
+
+def stop expr s =
+    message s ;
+    gobble readstring
+enddef ;
+
+% \\ and ??? can go
+
+permanent $, $$, (, ), upto, downto, exitunless, relax, \\, [[, ]], --, ---, ..., gobble, gobbled, stop, ?, ??? ;
+
+% These need to be adapted to a library approach:
+
+warningcheck     := 1 ;
+
+def interact = % sets up to make "show" commands stop
+    hide (
+        showstopping  := 1 ;
+        tracingonline := 1 ;
+    )
+enddef ;
+
+def loggingall = % puts tracing info into the log
+    tracingcommands  := 3 ;
+    tracingtitles    := 1 ;
+    tracingequations := 1 ;
+    tracingcapsules  := 1 ;
+    tracingspecs     := 2 ;
+    tracingchoices   := 1 ;
+    tracingstats     := 1 ;
+    tracingoutput    := 1 ;
+    tracingmacros    := 1 ;
+    tracingrestores  := 1 ;
+enddef ;
+
+def tracingall = % turns on every form of tracing
+    tracingonline := 1 ;
+    showstopping  := 1 ;
+    loggingall ;
+enddef ;
+
+def tracingnone = % turns off every form of tracing
+    tracingcommands  := 0 ;
+    tracingtitles    := 0 ;
+    tracingequations := 0 ;
+    tracingcapsules  := 0 ;
+    tracingspecs     := 0 ;
+    tracingchoices   := 0 ;
+    tracingstats     := 0 ;
+    tracingoutput    := 0 ;
+    tracingmacros    := 0 ;
+    tracingrestores  := 0 ;
+enddef ;
+
+permanent interact, loggingall, tracingall, tracingnone ;
+
+%% dash patterns
+
+vardef dashpattern(text t) =
+    save on, off, w ;
+    let on = _on_ ;
+    let off = _off_ ;
+    w = 0 ;
+    nullpicture t
+enddef ;
+
+tertiarydef p _on_ d =
+    begingroup save pic ;
+        picture pic;
+        pic = p ;
+        addto pic doublepath (w,w) .. (w+d,w) ;
+        w := w + d ;
+        pic shifted (0,d)
+    endgroup
+enddef ;
+
+tertiarydef p _off_ d =
+    begingroup w := w + d ;
+        p shifted (0,d)
+    endgroup
+enddef ;
+
+permanent dashpattern, _on_, _off_, on, off ; % on and off are not primitives
+
+%% basic constants and mathematical macros
+
+% numeric constants
+
+newinternal eps, epsilon, infinity, _ ;
+
+eps      := .00049 ;      % this is a pretty small positive number
+epsilon  := 1/256/256 ;   % but this is the smallest
+infinity := 4095.99998 ;  % and this is the largest
+_        := -1 ;          % internal constant to make macros unreadable but shorter
+
+immutable eps, epsilon, infinity, _ ;
+
+% linejoin and linecap types
+
+newinternal mitered, rounded, beveled, butt, squared ;
+
+mitered := 0 ; rounded := 1 ; beveled := 2 ;
+butt    := 0 ; rounded := 1 ; squared := 2 ;
+
+immutable mitered, rounded, beveled, butt, squared ;
+
+% pair constants
+
+pair right, left, up, down, origin;
+
+origin = (0,0) ;
+up     = -down = (0,1) ;
+right  = -left = (1,0) ;
+
+immutable right, left, up, down, origin ;
+
+% path constants
+
+path quartercircle, halfcircle, fullcircle, unitsquare ;
+
+fullcircle    = makepath pencircle ;
+halfcircle    = subpath (0,4) of fullcircle ;
+quartercircle = subpath (0,2) of fullcircle ;
+unitsquare    = (0,0) -- (1,0) -- (1,1) -- (0,1) -- cycle ;
+
+immutable quartercircle, halfcircle, fullcircle, unitsquare ;
+
+% transform constants
+
+transform identity ;
+
+for z=origin,right,up :
+    z transformed identity = z ;
+endfor ;
+
+immutable identity ;
+
+% color constants (all in rgb color space)
+
+color black, white, red, green, blue, cyan, magenta, yellow, background;
+
+black      := (0,0,0) ;
+white      := (1,1,1) ;
+red        := (1,0,0) ;
+green      := (0,1,0) ;
+blue       := (0,0,1) ;
+cyan       := (0,1,1) ;
+magenta    := (1,0,1) ;
+yellow     := (1,1,0) ;
+
+background := white ; % obsolete
+
+% should these be tagged with a property ?
+
+let graypart  = greypart  ;
+let greycolor = numeric ;
+let graycolor = numeric ;
+
+% color part (will be overloaded)
+
+def colorpart primary t =
+    if colormodel t = 7:
+        (cyanpart t, magentapart t, yellowpart t, blackpart t)
+    elseif colormodel t = 5 :
+        (redpart t, greenpart t, bluepart t)
+    elseif colormodel t = 3 :
+        (greypart t)
+    elseif colormodel t = 1 :
+        false
+    elseif defaultcolormodel = 7 :
+        (0,0,0,1)
+    elseif defaultcolormodel = 5 :
+        black
+    elseif defaultcolormodel = 3 :
+        0
+    else :
+        false
+    fi
+enddef ;
+
+permanent graypart, greycolor, graycolor ; % colorpart
+
+% picture constants
+
+picture blankpicture, evenly, withdots ;
+
+blankpicture = nullpicture ;                       % display blankpicture...
+evenly       = dashpattern(on 3 off 3) ;           % dashed evenly
+withdots     = dashpattern(off 2.5 on 0 off 2.5) ; % dashed withdots
+
+immutable blankpicture;
+permanent evenly, withdots ;
+
+% string constants
+
+string ditto, EOF ;
+
+ditto = char 34 ; % ASCII double-quote mark
+EOF   = char  0 ; % end-of-file for readfrom and write..to
+
+immutable ditto, EOF ;
+
+% pen constants
+
+pen pensquare, penrazor, penspec ;
+
+pensquare = makepen(unitsquare shifted -(.5,.5)) ;
+penrazor  = makepen((-.5,0) -- (.5,0) -- cycle) ;
+penspec   = pensquare scaled eps ;
+
+immutable pensquare, penrazor, penspec ;
+
+% nullary operators
+
+vardef whatever =
+    save ? ;
+    ?
+enddef ;
+
+permanent whatever ;
+
+% unary operators (with patched round)
+
+let abs = length ;
+
+vardef round primary u =
+    if numeric u :
+        floor(u+.5)
+    elseif pair u :
+        (floor(xpart u+.5), floor(ypart u+.5))
+    elseif path u :
+        % added by HH
+        for i=0 upto length u-1 :
+            round(point i of u) ..
+            controls round(postcontrol i of u) and round(precontrol i+1 of u) ..
+        endfor
+        if cycle u : cycle else : point infinity of u fi
+    else :
+        u
+    fi
+enddef ;
+
+vardef ceiling primary x =
+    -floor(-x)
+enddef ;
+
+vardef byte primary s =
+    if string s :
+        ASCII
+    fi s
+enddef ;
+
+vardef dir primary d =
+    right rotated d
+enddef ;
+
+vardef unitvector primary z =
+    z/abs z
+enddef ;
+
+vardef inverse primary t =
+    transform temp_transform ;
+    temp_transform transformed t = identity ;
+    temp_transform
+enddef ;
+
+vardef counterclockwise primary c =
+    if turningnumber c <= 0 :
+        reverse
+    fi c
+enddef ;
+
+vardef tensepath expr r =
+    for k=0 upto length r - 1 :
+        point k of r ---
+    endfor
+    if cycle r :
+        cycle
+    else :
+        point infinity of r
+    fi
+enddef ;
+
+vardef center primary p =
+    .5[llcorner p, urcorner p]
+enddef ;
+
+permanent abs, round, ceiling, byte, dir, unitvector, inverse, counterclockwise, tensepath, center ;
+
+% binary operators
+
+primarydef x mod y =
+    (x-y*floor(x/y))
+enddef ;
+
+primarydef x div y =
+    floor(x/y)
+enddef ;
+
+primarydef w dotprod z =
+    (xpart w * xpart z + ypart w * ypart z)
+enddef ;
+
+permanent mod, div, dotprod ;
+
+% primarydef x**y =
+%     if y = 2 :
+%         x*x
+%     else :
+%         takepower y of x
+%     fi
+% enddef ;
+%
+% def takepower expr y of x =
+%     if x>0 :
+%         mexp(y*mlog x)
+%     elseif (x=0) and (y>0) :
+%         0
+%     else :
+%         1
+%         if y = floor y :
+%             if y >= 0 :
+%                 for n=1 upto y :
+%                     *x
+%                 endfor
+%             else :
+%                 for n=-1 downto y :
+%                     /x
+%                 endfor
+%             fi
+%         else :
+%             hide(errmessage "Undefined power: " & decimal x & "**" & decimal y)
+%         fi
+%     fi
+% enddef ;
+
+% for big number systems:
+
+primarydef x**y =
+    if     y = 0 : 1
+    elseif x = 0 : 0
+    elseif y < 0 : 1/(x**-y)
+    elseif y = 1 : x
+    elseif y = 2 : x*x
+    elseif y = 3 : x*x*x
+    else         : takepower y of x
+    fi
+enddef ;
+
+def takepower expr y of x =
+    if y=0 : % isn't x**0 = 1 even if x=0 ?
+        1
+    elseif x=0 :
+        0
+    else :
+        if y = floor y :
+            1
+            if y >= 0 :
+                for n=1 upto y :
+                    *x
+                endfor
+            else :
+                for n=-1 downto y :
+                    /x
+                endfor
+            fi
+        elseif x > 0 :
+            mexp(y*mlog x)
+        else :
+            -mexp(y*mlog -x)
+        fi
+    fi
+enddef ;
+
+permanent **, takepower ;
+
+newinternal temp_internal_a, temp_internal_b ;
+newinternal temp_numeric_x, temp_numeric_y ;
+newinternal temp_internal_tx, temp_internal_ty, temp_internal_fx, temp_internal_fy ;
+newinternal temp_internal_n ;
+path        temp_path_a, temp_path_b ;
+pair        temp_pair_dz, temp_pair_z[] ;
+
+vardef direction expr t of p =
+    postcontrol t of p - precontrol t of p
+enddef ;
+
+vardef directionpoint expr z of p =
+    temp_internal_a := directiontime z of p ;
+    if temp_internal_a < 0 :
+        errmessage("The direction doesn't occur") ;
+    fi
+    point temp_internal_a of p
+enddef ;
+
+secondarydef p intersectionpoint q =
+    begingroup
+    save temp_numeric_x, temp_numeric_y ;
+    (temp_numeric_x,temp_numeric_y) = p intersectiontimes q ;
+    if temp_numeric_x < 0 :
+        errmessage("The paths don't intersect") ;
+        origin
+    else :
+        .5[point temp_numeric_x of p, point temp_numeric_y of q]
+    fi
+    endgroup
+enddef ;
+
+tertiarydef p softjoin q =
+    begingroup
+    temp_path_a := fullcircle scaled 2join_radius shifted point 0 of q ;
+    temp_internal_a := ypart(temp_path_a intersectiontimes p) ;
+    temp_internal_b := ypart(temp_path_a intersectiontimes q) ;
+    if temp_internal_a < 0 :
+        point 0 of p {direction 0 of p}
+    else :
+        subpath(0,temp_internal_a) of p
+    fi
+    ...
+    if temp_internal_b < 0 :
+        {direction infinity of q} point infinity of q
+    else :
+        subpath(temp_internal_b,infinity) of q
+    fi
+    endgroup
+enddef ;
+
+permanent direction, directionpoint, softjoin ;
+
+newinternal join_radius ;
+path cuttings ; % what got cut off
+
+tertiarydef a cutbefore b =  % tries to cut as little as possible
+    begingroup
+    save t ;
+    (t, whatever) = a intersectiontimes b ;
+    if t < 0 :
+        cuttings := point 0 of a ;
+        a
+    else :
+        cuttings := subpath (0,t) of a ;
+        subpath (t,length a) of a
+    fi
+    endgroup
+enddef ;
+
+tertiarydef a cutafter b =
+    reverse (reverse a  cutbefore  b)
+    hide(cuttings := reverse cuttings)
+enddef ;
+
+permanent join_radius, cuttings, cutbefore, cutafter ;
+
+% special operators
+
+vardef incr suffix $ = $ := $ + 1 ; $ enddef ;
+vardef decr suffix $ = $ := $ - 1 ; $ enddef ;
+
+permanent incr, decr ;
+
+def reflectedabout(expr w,z) = % reflects about the line w..z
+    transformed
+        begingroup
+        transform temp_transform ;
+        w transformed temp_transform = w ;
+        z transformed temp_transform = z ;
+        xxpart temp_transform = -yypart temp_transform ;
+        xypart temp_transform =  yxpart temp_transform ; % temp_transform is a reflection
+        temp_transform
+        endgroup
+enddef ;
+
+def rotatedaround(expr z, d) = % rotates d degrees around z
+    shifted -z rotated d shifted z
+enddef ;
+
+let rotatedabout = rotatedaround ; % for roundabout people
+
+permanent reflectedabout, rotatedaround, rotatedabout ;
+
+vardef min(expr u)(text t) = % t is a list of numerics, pairs, or strings
+    save temp_any_u ;
+    if pair u :
+        pair temp_any_u
+    elseif string u :
+        string temp_any_u
+    fi ;
+    temp_any_u = u
+    for i = t :
+        if i < temp_any_u :
+            temp_any_u := i ;
+        fi
+    endfor
+    temp_any_u
+enddef ;
+
+vardef max(expr u)(text t) = % t is a list of numerics, pairs, or strings
+    save temp_any_u ;
+    if pair u :
+        pair temp_any_u
+    elseif string u :
+        string temp_any_u
+    fi ;
+    temp_any_u = u
+    for i = t :
+        if i > temp_any_u :
+            temp_any_u := i ;
+        fi
+    endfor
+    temp_any_u
+enddef ;
+
+def flex(text t) = % t is a list of pairs
+    hide (
+        temp_internal_n := 0 ;
+        for z=t :
+            temp_pair_z[incr temp_internal_n] := z ;
+        endfor
+        temp_pair_dz := temp_pair_z[temp_internal_n]-temp_pair_z[1]
+    )
+    temp_pair_z[1] for k=2 upto temp_internal_n - 1 : ... temp_pair_z[k]{temp_pair_dz} endfor ... temp_pair_z[temp_internal_n]
+enddef ;
+
+permanent min, max, flex ;
+
+def superellipse(expr r, t, l, b, s) =
+    r { up    } ... (s[xpart t,xpart r],s[ypart r,ypart t]) { t-r } ...
+    t { left  } ... (s[xpart t,xpart l],s[ypart l,ypart t]) { l-t } ...
+    l { down  } ... (s[xpart b,xpart l],s[ypart l,ypart b]) { b-l } ...
+    b { right } ... (s[xpart b,xpart r],s[ypart r,ypart b]) { r-b } ... cycle enddef ;
+
+vardef interpath(expr a,p,q) =
+    for t=0 upto length p-1 :
+        a[point t of p, point t of q] .. controls a[postcontrol t of p, postcontrol t of q] and a[precontrol t+1 of p, precontrol t+1 of q] ..
+    endfor
+    if cycle p :
+        cycle
+    else :
+        a[point infinity of p, point infinity of q]
+    fi
+enddef ;
+
+permanent superellipse, interpath ;
+
+newinternal tolerance ; tolerance := .01 ;
+
+vardef solve@#(expr t, f)= % @#(t)=true, @#(f)=false
+    temp_internal_tx := t;
+    temp_internal_fx := f;
+    forever :
+        temp_numeric_x := .5[temp_internal_tx,temp_internal_fx] ;
+        exitif abs(temp_internal_tx - temp_internal_fx) <= tolerance ;
+        if @#(temp_numeric_x) :
+            temp_internal_tx
+        else :
+            temp_internal_fx
+        fi := temp_numeric_x ;
+    endfor
+    temp_numeric_x  % now temp_numeric_x is near where @# changes from true to false
+enddef ;
+
+vardef buildcycle(text ll) =
+    save temp_a, temp_b, temp_k, temp_i, temp_p ; path temp_p[] ;
+    temp_k = 0 ;
+    for q=ll :
+        temp_p[incr temp_k] = q ;
+    endfor
+    temp_i = temp_k ;
+    for i=1 upto temp_k :
+        (temp_a[i], length temp_p[temp_i]-temp_b[temp_i]) = temp_p[i] intersectiontimes reverse temp_p[temp_i] ;
+        if temp_a[i]<0 :
+            errmessage("Paths "& decimal i &" and "& decimal temp_i &" don't intersect") ;
+        fi
+        temp_i := i;
+    endfor
+    for i=1 upto temp_k :
+        subpath (temp_a[i],temp_b[i]) of temp_p[i] ..
+    endfor
+    cycle
+enddef ;
+
+permanent interpath, solve, buildcycle, tolerance ;
+
+%% units of measure
+
+mm :=  2.83464 ;
+pt :=  0.99626 ;
+dd :=  1.06601 ;
+bp :=  1 ;
+cm := 28.34645 ;
+pc := 11.95517 ;
+cc := 12.79213 ;
+in := 72 ;
+
+immutable mm, pt, dd, bp, cm, pc, cc, in ;
+
+% vardef magstep primary m = % obsolete
+%     mexp(46.67432m)
+% enddef ;
+
+%% macros for drawing and filling
+
+def drawoptions(text t) =
+    def base_draw_options = t enddef
+enddef ;
+
+% parameters that effect drawing
+
+linejoin   := rounded ;
+linecap    := rounded ;
+miterlimit := 10 ;
+
+drawoptions() ;
+
+pen currentpen ;
+picture currentpicture ;
+
+def fill expr c =
+    addto currentpicture contour c base_draw_options
+enddef ;
+
+def draw expr p =
+    addto currentpicture
+    if picture p :
+        also p
+    else :
+        doublepath p withpen currentpen
+    fi
+    base_draw_options
+enddef ;
+
+def filldraw expr c =
+    addto currentpicture contour c withpen currentpen base_draw_options
+enddef ;
+
+% def drawdot expr z =
+%     addto currentpicture contour makepath currentpen shifted z base_draw_options
+% enddef ;
+%
+% testcase DEK:
+%
+% for j=1 upto 9 :
+%     pickup pencircle xscaled .4 yscaled .2 ;
+%     drawdot (10j,0) withpen pencircle xscaled .5j yscaled .25j rotated 45 ;
+%     pickup pencircle xscaled .5j yscaled .25j rotated 45 ;
+%     drawdot (10j,10);
+% endfor ;
+%
+% or:
+%
+%\startMPpage
+%
+% def drawdot expr z =
+%     addto currentpicture contour (makepath currentpen shifted z) base_draw_options
+% enddef;
+%
+% drawdot origin shifted (0,-3cm) withpen pencircle scaled 2cm ;
+% pickup pencircle scaled 2cm ; drawdot origin withcolor red ;
+
+def drawdot expr p =
+    if pair p :
+        addto currentpicture doublepath p withpen currentpen base_draw_options
+    else :
+        errmessage("drawdot only accepts a pair expression")
+    fi
+enddef ;
+
+permanent drawoptions, currentpen, currentpicture, filldraw, drawdot ; % redefined later: fill, draw
+
+% Kind of obsolete:
+
+def unfill     expr c = fill     c withcolor background enddef ;
+def undraw     expr p = draw     p withcolor background enddef ;
+def unfilldraw expr c = filldraw c withcolor background enddef ;
+def undrawdot  expr z = drawdot  z withcolor background enddef ;
+
+def plain_erase = enddef ;
+
+def erase text t =
+    def plain_erase =
+        withcolor background hide(def plain_erase = enddef ;)
+    enddef ;
+    t plain_erase
+enddef ;
+
+def cutdraw text t =
+    begingroup
+        interim linecap := butt ;
+        draw t plain_erase ;
+    endgroup
+enddef ;
+
+permanent unfill, undraw, unfilldraw, undrawdot, erase, cutdraw ;
+
+% Popular:
+
+vardef image(text t) =
+    save currentpicture ;
+    picture currentpicture ;
+    currentpicture := nullpicture ;
+    t ;
+    currentpicture
+enddef ;
+
+permanent image ;
+
+def pickup secondary q =
+    if numeric q :
+        plain_pickup_numeric
+    else :
+        plain_pickup_path
+    fi q
+enddef ;
+
+% pens
+
+newinternal pen_lft, pen_rt, pen_top, pen_bot ;
+
+newinternal temp_pen_count ;
+path        temp_pen_result ;
+path        temp_pen_path.l, temp_pen_path.r ;
+numeric     temp_pen_l[], temp_pen_r[], temp_pen_t[], temp_pen_b[] ;
+pen         temp_pen_stack[] ;
+path        temp_pen_p[] ;
+
+pen         currentpen ;
+
+temp_pen_count := 0 ;
+
+def plain_pickup_numeric primary q =
+    if unknown temp_pen_stack[q] :
+        errmessage "Unknown pen" ;
+        clearpen
+    else :
+        currentpen := temp_pen_stack[q] ;
+        pen_lft := temp_pen_l[q] ;
+        pen_rt  := temp_pen_r[q] ;
+        pen_top := temp_pen_t[q] ;
+        pen_bot := temp_pen_b[q] ;
+        temp_pen_result := temp_pen_p[q]
+    fi ;
+enddef ;
+
+def plain_pickup_path primary q =
+    currentpen := q ;
+    pen_lft := xpart penoffset down  of currentpen ;
+    pen_rt  := xpart penoffset up    of currentpen ;
+    pen_top := ypart penoffset left  of currentpen ;
+    pen_bot := ypart penoffset right of currentpen ;
+    path temp_pen_result ;
+enddef ;
+
+vardef savepen =
+    temp_pen_stack[incr temp_pen_count] = currentpen ;
+    temp_pen_l[temp_pen_count] = pen_lft ;
+    temp_pen_r[temp_pen_count] = pen_rt ;
+    temp_pen_t[temp_pen_count] = pen_top ;
+    temp_pen_b[temp_pen_count] = pen_bot ;
+    temp_pen_p[temp_pen_count] = temp_pen_result ;
+    temp_pen_count
+enddef ;
+
+def clearpen =
+    currentpen := nullpen;
+    pen_lft := pen_rt := pen_top := pen_bot := 0 ;
+    path temp_pen_result ;
+enddef ;
+
+vardef lft primary x = x + if pair x: (pen_lft,0) else: pen_lft fi enddef ;
+vardef rt  primary x = x + if pair x: (pen_rt, 0) else: pen_rt  fi enddef ;
+vardef top primary y = y + if pair y: (0,pen_top) else: pen_top fi enddef ;
+vardef bot primary y = y + if pair y: (0,pen_bot) else: pen_bot fi enddef ;
+
+vardef penpos@#(expr b,d) =
+    (x@#r-x@#l,y@#r-y@#l) = (b,0) rotated d ;
+    x@# = .5(x@#l+x@#r) ;
+    y@# = .5(y@#l+y@#r) ; % ; added HH
+enddef ;
+
+def penstroke text t =
+    forsuffixes e = l, r :
+        temp_pen_path.e := t ;
+    endfor
+    fill temp_pen_path.l -- reverse temp_pen_path.r -- cycle
+enddef ;
+
+permanent
+    pen_lft, pen_rt, pen_top, pen_bot,
+    lft, rt, top, bot,
+    pickup, penpos, clearpen, penstroke, savepen ;
+
+%% High level drawing commands
+
+newinternal ahlength, ahangle ;
+
+ahlength :=  4 ; % default arrowhead length 4bp
+ahangle  := 45 ; % default head angle 45 degrees
+
+path temp_arrow_path ;
+
+vardef arrowhead expr p =
+    save q, e ; path q ; pair e ;
+    e = point length p of p ;
+    q = gobble(p shifted -e cutafter makepath(pencircle scaled 2ahlength)) cuttings ;
+    (q rotated .5ahangle & reverse q rotated -.5ahangle -- cycle) shifted e
+enddef ;
+
+def drawarrow    expr p = temp_arrow_path := p ; plain_arrow_finish enddef ;
+def drawdblarrow expr p = temp_arrow_path := p ; plain_arrow_find   enddef ;
+
+def plain_arrow_finish text t =
+    draw temp_arrow_path t ;
+    filldraw arrowhead temp_arrow_path t
+enddef ;
+
+def plain_arrow_find text t = % this had fill in 0.63 (potential incompatibility)
+    draw temp_arrow_path t ;
+    filldraw arrowhead         temp_arrow_path withpen currentpen t ;
+    filldraw arrowhead reverse temp_arrow_path withpen currentpen t ; % ; added HH
+enddef ;
+
+permanent ahlength, ahangle, arrowhead, drawarrow, drawdblarrow ;
+
+%% macros for labels
+
+newinternal bboxmargin ;
+
+bboxmargin := 2bp ; % this can bite you, just don't use it in \METAFUN
+
+vardef bbox primary p =
+    llcorner p - ( bboxmargin, bboxmargin) --
+    lrcorner p + ( bboxmargin,-bboxmargin) --
+    urcorner p + ( bboxmargin, bboxmargin) --
+    ulcorner p + (-bboxmargin, bboxmargin) -- cycle
+enddef ;
+
+permanent bboxmargin, bbox ;
+
+string defaultfont ; newinternal defaultscale, labeloffset, dotlabeldiam ;
+
+defaultfont  := "cmr10" ;
+defaultscale := 1 ;
+labeloffset  := 3bp ;
+dotlabeldiam := 3bp ;
+
+permanent defaultfont, defaultscale, labeloffset, dotlabeldiam ;
+
+vardef thelabel@#(expr s,z) = % Position s near z
+    save p ; picture p ;
+    if picture s :
+        p = s
+    else :
+        p = s infont defaultfont scaled defaultscale
+    fi ;
+    p shifted (z + labeloffset*laboff@# - ( labxf@#*lrcorner p + labyf@#*ulcorner p + (1-labxf@#-labyf@#)*llcorner p) )
+enddef ;
+
+def label =
+    draw thelabel
+enddef ;
+
+vardef dotlabel@#(expr s,z) text t =
+    label@#(s,z) t ;
+    interim linecap := rounded ;
+    draw z withpen pencircle scaled dotlabeldiam t ;
+enddef ;
+
+% def makelabel =
+%     dotlabel
+% enddef ;
+
+permanent label, dotlabel ;
+
+% this will be overloaded
+
+pair laboff, laboff.lft, laboff.rt, laboff.top, laboff.bot ;
+pair laboff.ulft, laboff.llft, laboff.urt, laboff.lrt ;
+
+laboff      = (0,0)    ; labxf      = .5 ; labyf      = .5 ;
+laboff.lft  = (-1,0)   ; labxf.lft  = 1  ; labyf.lft  = .5 ;
+laboff.rt   = (1,0)    ; labxf.rt   = 0  ; labyf.rt   = .5 ;
+laboff.bot  = (0,-1)   ; labxf.bot  = .5 ; labyf.bot  = 1  ;
+laboff.top  = (0,1)    ; labxf.top  = .5 ; labyf.top  = 0  ;
+laboff.ulft = (-.7,.7) ; labxf.ulft = 1  ; labyf.ulft = 0  ;
+laboff.urt  = (.7,.7)  ; labxf.urt  = 0  ; labyf.urt  = 0  ;
+laboff.llft = -(.7,.7) ; labxf.llft = 1  ; labyf.llft = 1  ;
+laboff.lrt  = (.7,-.7) ; labxf.lrt  = 0  ; labyf.lrt  = 1  ;
+
+vardef labels@#(text t) =
+    forsuffixes $=t :
+        label@#(str$,z$) ;
+    endfor
+enddef ;
+
+% till lhere
+
+vardef dotlabels@#(text t) =
+    forsuffixes $=t:
+        dotlabel@#(str$,z$) ;
+    endfor
+enddef ;
+
+vardef penlabels@#(text t) =
+    forsuffixes $$=l,,r :
+        forsuffixes $=t :
+            dotlabel@#(str$.$$,z$.$$) ;
+        endfor
+    endfor
+enddef ;
+
+permanent dotlabels, penlabels ;
+
+% range 4 thru 10
+
+def plain_numtok suffix x =
+    x
+enddef ;
+
+def range expr x =
+    plain_numtok[x]
+enddef ;
+
+tertiarydef m thru n =
+    m for x=m+1 step 1 until n :
+        , plain_numtok[x]
+    endfor
+enddef ;
+
+permanent range, thru ;
+
+%% Overall administration
+
+% Todo: make an add to this helper thet temporarily disables warning
+
+string extra_beginfig, extra_endfig ;
+
+extra_beginfig := "" ;
+extra_endfig   := "" ;
+
+def beginfig(expr c) =
+    begingroup
+    charcode := c ;
+    clearxy ;
+    clearit ;
+    clearpen ;
+    pickup defaultpen ;
+    drawoptions() ;
+    scantokens extra_beginfig ;
+enddef ;
+
+def endfig =
+    ; % added by HH
+    scantokens extra_endfig ;
+    shipit ;
+    endgroup
+enddef ;
+
+permanent
+  % extra_beginfig, extra_endfig,
+    beginfig, endfig ;
+
+%% last-minute items
+
+vardef z@# =
+    (x@#,y@#)
+enddef ;
+
+def clearxy =
+    save x, y
+enddef ;
+
+def clearit =
+    currentpicture := nullpicture
+enddef ;
+
+clearit ;
+
+permanent z, clearit ; % redefined: clearxy
+
+def shipit =
+    shipout currentpicture
+enddef ;
+
+let bye = end ;
+outer end, bye ;
+
+permanent shipit, bye ;
+
+% set default line width
+
+newinternal defaultpen ;
+
+pickup pencircle scaled .5bp ;
+
+defaultpen := savepen ;
+
+permanent defaultpen ;
diff --git a/metapost/context/base/mpxl/mp-blob.mpxl b/metapost/context/base/mpxl/mp-blob.mpxl
new file mode 100644
index 000000000..9dffc3e80
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-blob.mpxl
@@ -0,0 +1,118 @@
+%D \module
+%D   [       file=mp-blob.mpiv,
+%D        version=2018.04.08,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=Blobs,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This is a follow up on good old \type {meta-imp-txt}.
+
+if known context_blob : endinput ; fi ;
+
+boolean context_blob ; context_blob := true ; immutable context_blob ;
+
+numeric mfun_blob_n ; mfun_blob_n := 0 ;
+picture mfun_blob_c ;
+color   mfun_blob_b ;
+
+def mfun_reset_tex_blobs =
+    mfun_blob_n := 0 ;
+    mfun_blob_c := nullpicture ;
+enddef ;
+
+extra_endfig := extra_endfig & "mfun_reset_tex_blobs ; " ;
+
+vardef mfun_inject_blob(expr n) =
+    mfun_blob_c := nullpicture ;
+    mfun_blob_b := lua.mp.mf_blob_dimensions(mfun_blob_n,n) ;
+    addto mfun_blob_c doublepath unitsquare
+        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.mf_blob_index(mfun_blob_n,n) ;
+    mfun_blob_c
+enddef ;
+
+% An example of usage:
+
+newinternal followtextalternative   ; followtextalternative   := 1 ;
+newinternal tracingfollowtext       ; tracingfollowtext       := 0 ;
+newinternal autoscaleupfollowtext   ; autoscaleupfollowtext   := 2 ;
+newinternal autoscaledownfollowtext ; autoscaledownfollowtext := 0 ;
+
+permanent tracingfollowtext ;
+
+vardef followtext(expr pth, txt) =
+    image (
+        mfun_blob_n := mfun_blob_n + 1 ;
+        lua.mp.mf_inject_blob(mfun_blob_n,txt);
+        save pat, al, at, pl, pc, wid, pos, ap, ad, pic, len, n, b, sc ;
+        path pat, b ; pat := pth ;
+        numeric al, at, pl, pc, wid, pos, len[], n, sc ;
+        pair ap, ad ;
+        picture pic[] ;
+        len[0] := 0 ;
+        n := lua.mp.mf_blob_size(mfun_blob_n) ;
+        sc := 0 ;
+        for i=1 upto n :
+            pic[i] := mfun_inject_blob(i) ;
+            pic[i] := pic[i] shifted - llcorner pic[i] ;
+            len[i] := len[i-1] + lua.mp.mf_blob_width(mfun_blob_n,i) ;
+        endfor ;
+        al := arclength pth ;
+        if al = 0 :
+            al := len[n] ;
+            pat := origin -- (al,0) ;
+        fi ;
+        if ((al < len[n]) and (autoscaleupfollowtext   > 0)) or
+           ((al > len[n]) and (autoscaledownfollowtext > 0)) :
+            sc := len[n] /al ;
+            pat := pat scaled sc ;
+            al := arclength pat ;
+        fi ;
+        if followtextalternative = 1 :
+            pl := (al-len[n])/(if n>1 : (n-1) else : 1 fi) ;
+            pc := 0 ;
+        else : % centered / MP
+            pl := 0 ;
+            pc := arclength pat/2 - len[n]/2 ;
+        fi ;
+        if tracingfollowtext = 1 :
+            draw pat withpen pencircle scaled 1pt withcolor blue ;
+        fi ;
+        for i=1 upto n :
+            wid := lua.mp.mf_blob_width(mfun_blob_n,i) ;
+            pos := len[i]-wid/2 + (i-1)*pl + pc ;
+            at := arctime   pos of pat ;
+            ap := point     at  of pat ;
+            ad := direction at  of pat ;
+            pic[i] := pic[i]
+                shifted (-wid/2,0)
+                if ad <> origin : rotated(angle(ad)) fi
+                shifted ap ;
+            draw pic[i] ;
+            if tracingfollowtext = 1 :
+                draw boundingbox pic[i] withpen pencircle scaled .25pt withcolor red ;
+                draw ap withpen pencircle scaled .50pt withcolor green ;
+            fi ;
+        endfor ;
+        if ((autoscaleupfollowtext = 2) or (autoscaledownfollowtext = 2)) and (sc <> 0) and (sc <> 1):
+            currentpicture := currentpicture scaled (1/sc) ;
+        fi ;
+        b := boundingbox currentpicture ;
+        if tracingfollowtext = 1 :
+            draw b withpen pencircle scaled .25pt withcolor blue ;
+        fi ;
+        draw fullcircle scaled 100bp
+            withprescript "mf_object=followtext"
+            withprescript "ft_category=" & decimal mfun_blob_n ;
+        setbounds currentpicture to b ;
+    )
+enddef ;
diff --git a/metapost/context/base/mpxl/mp-butt.mpxl b/metapost/context/base/mpxl/mp-butt.mpxl
new file mode 100644
index 000000000..7900c6037
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-butt.mpxl
@@ -0,0 +1,77 @@
+%D \module
+%D   [       file=mp-butt.mpiv,
+%D        version=2000.05.31,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=buttons,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if known context_butt : endinput ; fi ;
+
+boolean context_butt ; context_butt := true ; immutable context_butt ;
+
+def predefinedbutton (expr button_type, button_size, button_linecolor, button_fillcolor) =
+
+    begingroup ;
+
+    save button_linewidth, p, d, l ;
+
+    numeric button_linewidth ; button_linewidth := button_size/10 ;
+
+    drawoptions (withpen pencircle scaled button_linewidth withcolor button_linecolor) ;
+
+    path    p ; p := unitsquare scaled button_size ;
+    numeric d ; d := button_size ;
+    numeric l ; l := button_linewidth ;
+
+    fill p withcolor button_fillcolor ;
+    draw p ;
+
+    if     button_type = 101 :
+        draw (d-2l,2l)--(2l,.5d)--(d-2l,d-2l)--cycle ;
+    elseif button_type = 102 :
+        draw (2l,2l)--(d-2l,.5d)--(2l,d-2l)--cycle ;
+    elseif button_type = 103 :
+        for i=2l step 2l until d-2l :
+            draw (2l,i)--(2l  ,i) ;
+            draw (4l,i)--(d-2l,i) ;
+        endfor ;
+    elseif button_type = 104 :
+        for i=2l step 2l until d-2l :
+            draw (2l   ,i)--(d/2-l,i) ;
+            draw (d/2+l,i)--(d-2l ,i) ;
+        endfor ;
+    elseif button_type = 105 :
+        fill fullcircle scaled (.2d) shifted (.5d,.7d) ;
+        fill fullcircle xscaled (.6d) yscaled d shifted (.5d,0) ;
+        clip currentpicture to p ;
+        draw p ;
+    elseif button_type = 106 :
+        draw (2l,2l)--(d-2l,d-2l) ;
+        draw (d-2l,2l)--(2l,d-2l) ;
+    elseif button_type = 107 :
+        p := (3l,d-2l)--(d-3l,d-2l)--(.5d,4l)--cycle ;
+        fill p ; draw p ;
+        draw (.5d,2l) ;
+    elseif button_type = 108 :
+        draw (.5d,2l)--(d-2l,d-2l)--(2l,d-2l)--cycle ;
+    elseif button_type = 109 :
+        draw (.5d,d-2l)--(d-2l,2l)--(2l,2l)--cycle ;
+    elseif button_type = 110 :
+        button_linewidth := button_linewidth/2 ;
+        draw p enlarged (-2l,-l) ;
+        for i=2l step l until d-2l :
+            draw (3l,i)--(d-3l,i) ;
+        endfor ;
+    fi ;
+
+    endgroup ;
+
+enddef ;
+
+let some_button = predefinedbutton
diff --git a/metapost/context/base/mpxl/mp-cont.mpxl b/metapost/context/base/mpxl/mp-cont.mpxl
index bc318d4b9..c65d27412 100644
--- a/metapost/context/base/mpxl/mp-cont.mpxl
+++ b/metapost/context/base/mpxl/mp-cont.mpxl
@@ -15,7 +15,7 @@
 
 if known context_cont : endinput ; fi ;
 
-boolean context_cont ; context_cont := true ;
+boolean context_cont ; context_cont := true ; immutable context_cont ;
 
 string CurrentLayout ; CurrentLayout := "default" ;
 
@@ -25,99 +25,133 @@ def SwapPageState =
     mfun_swapped := true ; % eventually this will go !
 enddef ;
 
+permanent CurrentLayout, SwapPageState ;
+
 extra_beginfig := extra_beginfig & "mfun_swapped := false ;" ;
 
-newinternal mfid_PaperHeight          ; mfid_PaperHeight          := scriptindex "PaperHeight"          ; vardef PaperHeight          = runscript mfid_PaperHeight          enddef ;
-newinternal mfid_PaperWidth           ; mfid_PaperWidth           := scriptindex "PaperWidth"           ; vardef PaperWidth           = runscript mfid_PaperWidth           enddef ;
-newinternal mfid_PrintPaperHeight     ; mfid_PrintPaperHeight     := scriptindex "PrintPaperHeight"     ; vardef PrintPaperHeight     = runscript mfid_PrintPaperHeight     enddef ;
-newinternal mfid_PrintPaperWidth      ; mfid_PrintPaperWidth      := scriptindex "PrintPaperWidth"      ; vardef PrintPaperWidth      = runscript mfid_PrintPaperWidth      enddef ;
-newinternal mfid_TopSpace             ; mfid_TopSpace             := scriptindex "TopSpace"             ; vardef TopSpace             = runscript mfid_TopSpace             enddef ;
-newinternal mfid_BottomSpace          ; mfid_BottomSpace          := scriptindex "BottomSpace"          ; vardef BottomSpace          = runscript mfid_BottomSpace          enddef ;
-newinternal mfid_BackSpace            ; mfid_BackSpace            := scriptindex "BackSpace"            ; vardef BackSpace            = runscript mfid_BackSpace            enddef ;
-newinternal mfid_CutSpace             ; mfid_CutSpace             := scriptindex "CutSpace"             ; vardef CutSpace             = runscript mfid_CutSpace             enddef ;
-newinternal mfid_MakeupHeight         ; mfid_MakeupHeight         := scriptindex "MakeupHeight"         ; vardef MakeupHeight         = runscript mfid_MakeupHeight         enddef ;
-newinternal mfid_MakeupWidth          ; mfid_MakeupWidth          := scriptindex "MakeupWidth"          ; vardef MakeupWidth          = runscript mfid_MakeupWidth          enddef ;
-newinternal mfid_TopHeight            ; mfid_TopHeight            := scriptindex "TopHeight"            ; vardef TopHeight            = runscript mfid_TopHeight            enddef ;
-newinternal mfid_TopDistance          ; mfid_TopDistance          := scriptindex "TopDistance"          ; vardef TopDistance          = runscript mfid_TopDistance          enddef ;
-newinternal mfid_HeaderHeight         ; mfid_HeaderHeight         := scriptindex "HeaderHeight"         ; vardef HeaderHeight         = runscript mfid_HeaderHeight         enddef ;
-newinternal mfid_HeaderDistance       ; mfid_HeaderDistance       := scriptindex "HeaderDistance"       ; vardef HeaderDistance       = runscript mfid_HeaderDistance       enddef ;
-newinternal mfid_TextHeight           ; mfid_TextHeight           := scriptindex "TextHeight"           ; vardef TextHeight           = runscript mfid_TextHeight           enddef ;
-newinternal mfid_FooterDistance       ; mfid_FooterDistance       := scriptindex "FooterDistance"       ; vardef FooterDistance       = runscript mfid_FooterDistance       enddef ;
-newinternal mfid_FooterHeight         ; mfid_FooterHeight         := scriptindex "FooterHeight"         ; vardef FooterHeight         = runscript mfid_FooterHeight         enddef ;
-newinternal mfid_BottomDistance       ; mfid_BottomDistance       := scriptindex "BottomDistance"       ; vardef BottomDistance       = runscript mfid_BottomDistance       enddef ;
-newinternal mfid_BottomHeight         ; mfid_BottomHeight         := scriptindex "BottomHeight"         ; vardef BottomHeight         = runscript mfid_BottomHeight         enddef ;
-newinternal mfid_LeftEdgeWidth        ; mfid_LeftEdgeWidth        := scriptindex "LeftEdgeWidth"        ; vardef LeftEdgeWidth        = runscript mfid_LeftEdgeWidth        enddef ;
-newinternal mfid_LeftEdgeDistance     ; mfid_LeftEdgeDistance     := scriptindex "LeftEdgeDistance"     ; vardef LeftEdgeDistance     = runscript mfid_LeftEdgeDistance     enddef ;
-newinternal mfid_LeftMarginWidth      ; mfid_LeftMarginWidth      := scriptindex "LeftMarginWidth"      ; vardef LeftMarginWidth      = runscript mfid_LeftMarginWidth      enddef ;
-newinternal mfid_LeftMarginDistance   ; mfid_LeftMarginDistance   := scriptindex "LeftMarginDistance"   ; vardef LeftMarginDistance   = runscript mfid_LeftMarginDistance   enddef ;
-newinternal mfid_TextWidth            ; mfid_TextWidth            := scriptindex "TextWidth"            ; vardef TextWidth            = runscript mfid_TextWidth            enddef ;
-newinternal mfid_RightMarginDistance  ; mfid_RightMarginDistance  := scriptindex "RightMarginDistance"  ; vardef RightMarginDistance  = runscript mfid_RightMarginDistance  enddef ;
-newinternal mfid_RightMarginWidth     ; mfid_RightMarginWidth     := scriptindex "RightMarginWidth"     ; vardef RightMarginWidth     = runscript mfid_RightMarginWidth     enddef ;
-newinternal mfid_RightEdgeDistance    ; mfid_RightEdgeDistance    := scriptindex "RightEdgeDistance"    ; vardef RightEdgeDistance    = runscript mfid_RightEdgeDistance    enddef ;
-newinternal mfid_RightEdgeWidth       ; mfid_RightEdgeWidth       := scriptindex "RightEdgeWidth"       ; vardef RightEdgeWidth       = runscript mfid_RightEdgeWidth       enddef ;
-newinternal mfid_InnerMarginDistance  ; mfid_InnerMarginDistance  := scriptindex "InnerMarginDistance"  ; vardef InnerMarginDistance  = runscript mfid_InnerMarginDistance  enddef ;
-newinternal mfid_InnerMarginWidth     ; mfid_InnerMarginWidth     := scriptindex "InnerMarginWidth"     ; vardef InnerMarginWidth     = runscript mfid_InnerMarginWidth     enddef ;
-newinternal mfid_OuterMarginDistance  ; mfid_OuterMarginDistance  := scriptindex "OuterMarginDistance"  ; vardef OuterMarginDistance  = runscript mfid_OuterMarginDistance  enddef ;
-newinternal mfid_OuterMarginWidth     ; mfid_OuterMarginWidth     := scriptindex "OuterMarginWidth"     ; vardef OuterMarginWidth     = runscript mfid_OuterMarginWidth     enddef ;
-newinternal mfid_InnerEdgeDistance    ; mfid_InnerEdgeDistance    := scriptindex "InnerEdgeDistance"    ; vardef InnerEdgeDistance    = runscript mfid_InnerEdgeDistance    enddef ;
-newinternal mfid_InnerEdgeWidth       ; mfid_InnerEdgeWidth       := scriptindex "InnerEdgeWidth"       ; vardef InnerEdgeWidth       = runscript mfid_InnerEdgeWidth       enddef ;
-newinternal mfid_OuterEdgeDistance    ; mfid_OuterEdgeDistance    := scriptindex "OuterEdgeDistance"    ; vardef OuterEdgeDistance    = runscript mfid_OuterEdgeDistance    enddef ;
-newinternal mfid_OuterEdgeWidth       ; mfid_OuterEdgeWidth       := scriptindex "OuterEdgeWidth"       ; vardef OuterEdgeWidth       = runscript mfid_OuterEdgeWidth       enddef ;
-newinternal mfid_PageOffset           ; mfid_PageOffset           := scriptindex "PageOffset"           ; vardef PageOffset           = runscript mfid_PageOffset           enddef ;
-newinternal mfid_PageDepth            ; mfid_PageDepth            := scriptindex "PageDepth"            ; vardef PageDepth            = runscript mfid_PageDepth            enddef ;
-newinternal mfid_LayoutColumns        ; mfid_LayoutColumns        := scriptindex "LayoutColumns"        ; vardef LayoutColumns        = runscript mfid_LayoutColumns        enddef ;
-newinternal mfid_LayoutColumnDistance ; mfid_LayoutColumnDistance := scriptindex "LayoutColumnDistance" ; vardef LayoutColumnDistance = runscript mfid_LayoutColumnDistance enddef ;
-newinternal mfid_LayoutColumnWidth    ; mfid_LayoutColumnWidth    := scriptindex "LayoutColumnWidth"    ; vardef LayoutColumnWidth    = runscript mfid_LayoutColumnWidth    enddef ;
-
-newinternal mfid_OnRightPage          ; mfid_OnRightPage          := scriptindex "OnRightPage"          ; vardef OnRightPage          = runscript mfid_OnRightPage          enddef ;
-newinternal mfid_OnOddPage            ; mfid_OnOddPage            := scriptindex "OnOddPage"            ; vardef OnOddPage            = runscript mfid_OnOddPage            enddef ;
-newinternal mfid_InPageBody           ; mfid_InPageBody           := scriptindex "InPageBody"           ; vardef InPageBody           = runscript mfid_InPageBody           enddef ;
-
-newinternal mfid_RealPageNumber       ; mfid_RealPageNumber       := scriptindex "RealPageNumber"       ; vardef RealPageNumber       = runscript mfid_RealPageNumber       enddef ;
-newinternal mfid_LastPageNumber       ; mfid_LastPageNumber       := scriptindex "LastPageNumber"       ; vardef LastPageNumber       = runscript mfid_LastPageNumber       enddef ;
-
-newinternal mfid_PageNumber           ; mfid_PageNumber           := scriptindex "PageNumber"           ; vardef PageNumber           = runscript mfid_PageNumber           enddef ;
-newinternal mfid_NOfPages             ; mfid_NOfPages             := scriptindex "NOfPages"             ; vardef NOfPages             = runscript mfid_NOfPages             enddef ;
-
-newinternal mfid_SubPageNumber        ; mfid_SubPageNumber        := scriptindex "SubPageNumber"        ; vardef SubPageNumber        = runscript mfid_SubPageNumber        enddef ;
-newinternal mfid_NOfSubPages          ; mfid_NOfSubPages          := scriptindex "NOfSubPages"          ; vardef NOfSubPages          = runscript mfid_NOfSubPages          enddef ;
-
-newinternal mfid_CurrentColumn        ; mfid_CurrentColumn        := scriptindex "CurrentColumn"        ; vardef CurrentColumn        = runscript mfid_CurrentColumn        enddef ;
-newinternal mfid_NOfColumns           ; mfid_NOfColumns           := scriptindex "NOfColumns"           ; vardef NOfColumns           = runscript mfid_NOfColumns           enddef ;
-
-newinternal mfid_BaseLineSkip         ; mfid_BaseLineSkip         := scriptindex "BaseLineSkip"         ; vardef BaseLineSkip         = runscript mfid_BaseLineSkip         enddef ;
-newinternal mfid_LineHeight           ; mfid_LineHeight           := scriptindex "LineHeight"           ; vardef LineHeight           = runscript mfid_LineHeight           enddef ;
-newinternal mfid_BodyFontSize         ; mfid_BodyFontSize         := scriptindex "BodyFontSize"         ; vardef BodyFontSize         = runscript mfid_BodyFontSize         enddef ;
-
-newinternal mfid_TopSkip              ; mfid_TopSkip              := scriptindex "TopSkip"              ; vardef TopSkip              = runscript mfid_TopSkip              enddef ;
-newinternal mfid_StrutHeight          ; mfid_StrutHeight          := scriptindex "StrutHeight"          ; vardef StrutHeight          = runscript mfid_StrutHeight          enddef ;
-newinternal mfid_StrutDepth           ; mfid_StrutDepth           := scriptindex "StrutDepth"           ; vardef StrutDepth           = runscript mfid_StrutDepth           enddef ;
-
-newinternal mfid_CurrentWidth         ; mfid_CurrentWidth         := scriptindex "CurrentWidth"         ; vardef CurrentWidth         = runscript mfid_CurrentWidth         enddef ;
-newinternal mfid_CurrentHeight        ; mfid_CurrentHeight        := scriptindex "CurrentHeight"        ; vardef CurrentHeight        = runscript mfid_CurrentHeight        enddef ;
-
-newinternal mfid_HSize                ; mfid_HSize                := scriptindex "HSize"                ; vardef HSize                = runscript mfid_HSize                enddef ;
-newinternal mfid_VSize                ; mfid_VSize                := scriptindex "VSize"                ; vardef VSize                = runscript mfid_VSize                enddef ;
-
-newinternal mfid_EmWidth              ; mfid_EmWidth              := scriptindex "EmWidth"              ; vardef EmWidth              = runscript mfid_EmWidth              enddef ;
-newinternal mfid_ExHeight             ; mfid_ExHeight             := scriptindex "ExHeight"             ; vardef ExHeight             = runscript mfid_ExHeight             enddef ;
-
-newinternal mfid_PageFraction         ; mfid_PageFraction         := scriptindex "PageFraction"         ; vardef PageFraction         = runscript mfid_PageFraction         enddef ;
-
-newinternal mfid_SpineWidth           ; mfid_SpineWidth           := scriptindex "SpineWidth"           ; vardef SpineWidth           = runscript mfid_SpineWidth           enddef ;
-newinternal mfid_PaperBleed           ; mfid_PaperBleed           := scriptindex "PaperBleed"           ; vardef PaperBleed           = runscript mfid_PaperBleed           enddef ;
-
-%           mfid_CurrentLayout        ; mfid_CurrentLayout        := scriptindex "CurrentLayout"        ; vardef CurrentLayout        = runscript mfid_CurrentLayout        enddef ;
-newinternal mfid_OverlayWidth         ; mfid_OverlayWidth         := scriptindex "OverlayWidth"         ; vardef OverlayWidth         = runscript mfid_OverlayWidth         enddef ;
-newinternal mfid_OverlayHeight        ; mfid_OverlayHeight        := scriptindex "OverlayHeight"        ; vardef OverlayHeight        = runscript mfid_OverlayHeight        enddef ;
-newinternal mfid_OverlayDepth         ; mfid_OverlayDepth         := scriptindex "OverlayDepth"         ; vardef OverlayDepth         = runscript mfid_OverlayDepth         enddef ;
-newinternal mfid_OverlayLineWidth     ; mfid_OverlayLineWidth     := scriptindex "OverlayLineWidth"     ; vardef OverlayLineWidth     = runscript mfid_OverlayLineWidth     enddef ;
-newinternal mfid_OverlayOffset        ; mfid_OverlayOffset        := scriptindex "OverlayOffset"        ; vardef OverlayOffset        = runscript mfid_OverlayOffset        enddef ;
-newinternal mfid_OverlayRegion        ; mfid_OverlayRegion        := scriptindex "OverlayRegion"        ; vardef OverlayRegion        = runscript mfid_OverlayRegion        enddef ;
-%           mfid_OverlayLineColor     ; mfid_OverlayLineColor     := scriptindex "OverlayLineColor      ; vardef OverlayLineColor     = runscript mfid_OverlayLineColor     enddef ;
-%           mfid_OverlayColor         ; mfid_OverlayColor         := scriptindex "OverlayColor          ; vardef OverlayColor         = runscript mfid_OverlayColor         enddef ;
-
-newinternal mfid_defaultcolormodel    ; mfid_defaultcolormodel    := scriptindex "defaultcolormodel"    ; vardef defaultcolormodel = runscript mfid_defaultcolormodel enddef ;
+newscriptindex mfid_PaperHeight          ; mfid_PaperHeight          := scriptindex "PaperHeight"          ; vardef PaperHeight          = runscript mfid_PaperHeight          enddef ;
+newscriptindex mfid_PaperWidth           ; mfid_PaperWidth           := scriptindex "PaperWidth"           ; vardef PaperWidth           = runscript mfid_PaperWidth           enddef ;
+newscriptindex mfid_PrintPaperHeight     ; mfid_PrintPaperHeight     := scriptindex "PrintPaperHeight"     ; vardef PrintPaperHeight     = runscript mfid_PrintPaperHeight     enddef ;
+newscriptindex mfid_PrintPaperWidth      ; mfid_PrintPaperWidth      := scriptindex "PrintPaperWidth"      ; vardef PrintPaperWidth      = runscript mfid_PrintPaperWidth      enddef ;
+newscriptindex mfid_TopSpace             ; mfid_TopSpace             := scriptindex "TopSpace"             ; vardef TopSpace             = runscript mfid_TopSpace             enddef ;
+newscriptindex mfid_BottomSpace          ; mfid_BottomSpace          := scriptindex "BottomSpace"          ; vardef BottomSpace          = runscript mfid_BottomSpace          enddef ;
+newscriptindex mfid_BackSpace            ; mfid_BackSpace            := scriptindex "BackSpace"            ; vardef BackSpace            = runscript mfid_BackSpace            enddef ;
+newscriptindex mfid_CutSpace             ; mfid_CutSpace             := scriptindex "CutSpace"             ; vardef CutSpace             = runscript mfid_CutSpace             enddef ;
+newscriptindex mfid_MakeupHeight         ; mfid_MakeupHeight         := scriptindex "MakeupHeight"         ; vardef MakeupHeight         = runscript mfid_MakeupHeight         enddef ;
+newscriptindex mfid_MakeupWidth          ; mfid_MakeupWidth          := scriptindex "MakeupWidth"          ; vardef MakeupWidth          = runscript mfid_MakeupWidth          enddef ;
+newscriptindex mfid_TopHeight            ; mfid_TopHeight            := scriptindex "TopHeight"            ; vardef TopHeight            = runscript mfid_TopHeight            enddef ;
+newscriptindex mfid_TopDistance          ; mfid_TopDistance          := scriptindex "TopDistance"          ; vardef TopDistance          = runscript mfid_TopDistance          enddef ;
+newscriptindex mfid_HeaderHeight         ; mfid_HeaderHeight         := scriptindex "HeaderHeight"         ; vardef HeaderHeight         = runscript mfid_HeaderHeight         enddef ;
+newscriptindex mfid_HeaderDistance       ; mfid_HeaderDistance       := scriptindex "HeaderDistance"       ; vardef HeaderDistance       = runscript mfid_HeaderDistance       enddef ;
+newscriptindex mfid_TextHeight           ; mfid_TextHeight           := scriptindex "TextHeight"           ; vardef TextHeight           = runscript mfid_TextHeight           enddef ;
+newscriptindex mfid_FooterDistance       ; mfid_FooterDistance       := scriptindex "FooterDistance"       ; vardef FooterDistance       = runscript mfid_FooterDistance       enddef ;
+newscriptindex mfid_FooterHeight         ; mfid_FooterHeight         := scriptindex "FooterHeight"         ; vardef FooterHeight         = runscript mfid_FooterHeight         enddef ;
+newscriptindex mfid_BottomDistance       ; mfid_BottomDistance       := scriptindex "BottomDistance"       ; vardef BottomDistance       = runscript mfid_BottomDistance       enddef ;
+newscriptindex mfid_BottomHeight         ; mfid_BottomHeight         := scriptindex "BottomHeight"         ; vardef BottomHeight         = runscript mfid_BottomHeight         enddef ;
+newscriptindex mfid_LeftEdgeWidth        ; mfid_LeftEdgeWidth        := scriptindex "LeftEdgeWidth"        ; vardef LeftEdgeWidth        = runscript mfid_LeftEdgeWidth        enddef ;
+newscriptindex mfid_LeftEdgeDistance     ; mfid_LeftEdgeDistance     := scriptindex "LeftEdgeDistance"     ; vardef LeftEdgeDistance     = runscript mfid_LeftEdgeDistance     enddef ;
+newscriptindex mfid_LeftMarginWidth      ; mfid_LeftMarginWidth      := scriptindex "LeftMarginWidth"      ; vardef LeftMarginWidth      = runscript mfid_LeftMarginWidth      enddef ;
+newscriptindex mfid_LeftMarginDistance   ; mfid_LeftMarginDistance   := scriptindex "LeftMarginDistance"   ; vardef LeftMarginDistance   = runscript mfid_LeftMarginDistance   enddef ;
+newscriptindex mfid_TextWidth            ; mfid_TextWidth            := scriptindex "TextWidth"            ; vardef TextWidth            = runscript mfid_TextWidth            enddef ;
+newscriptindex mfid_RightMarginDistance  ; mfid_RightMarginDistance  := scriptindex "RightMarginDistance"  ; vardef RightMarginDistance  = runscript mfid_RightMarginDistance  enddef ;
+newscriptindex mfid_RightMarginWidth     ; mfid_RightMarginWidth     := scriptindex "RightMarginWidth"     ; vardef RightMarginWidth     = runscript mfid_RightMarginWidth     enddef ;
+newscriptindex mfid_RightEdgeDistance    ; mfid_RightEdgeDistance    := scriptindex "RightEdgeDistance"    ; vardef RightEdgeDistance    = runscript mfid_RightEdgeDistance    enddef ;
+newscriptindex mfid_RightEdgeWidth       ; mfid_RightEdgeWidth       := scriptindex "RightEdgeWidth"       ; vardef RightEdgeWidth       = runscript mfid_RightEdgeWidth       enddef ;
+newscriptindex mfid_InnerMarginDistance  ; mfid_InnerMarginDistance  := scriptindex "InnerMarginDistance"  ; vardef InnerMarginDistance  = runscript mfid_InnerMarginDistance  enddef ;
+newscriptindex mfid_InnerMarginWidth     ; mfid_InnerMarginWidth     := scriptindex "InnerMarginWidth"     ; vardef InnerMarginWidth     = runscript mfid_InnerMarginWidth     enddef ;
+newscriptindex mfid_OuterMarginDistance  ; mfid_OuterMarginDistance  := scriptindex "OuterMarginDistance"  ; vardef OuterMarginDistance  = runscript mfid_OuterMarginDistance  enddef ;
+newscriptindex mfid_OuterMarginWidth     ; mfid_OuterMarginWidth     := scriptindex "OuterMarginWidth"     ; vardef OuterMarginWidth     = runscript mfid_OuterMarginWidth     enddef ;
+newscriptindex mfid_InnerEdgeDistance    ; mfid_InnerEdgeDistance    := scriptindex "InnerEdgeDistance"    ; vardef InnerEdgeDistance    = runscript mfid_InnerEdgeDistance    enddef ;
+newscriptindex mfid_InnerEdgeWidth       ; mfid_InnerEdgeWidth       := scriptindex "InnerEdgeWidth"       ; vardef InnerEdgeWidth       = runscript mfid_InnerEdgeWidth       enddef ;
+newscriptindex mfid_OuterEdgeDistance    ; mfid_OuterEdgeDistance    := scriptindex "OuterEdgeDistance"    ; vardef OuterEdgeDistance    = runscript mfid_OuterEdgeDistance    enddef ;
+newscriptindex mfid_OuterEdgeWidth       ; mfid_OuterEdgeWidth       := scriptindex "OuterEdgeWidth"       ; vardef OuterEdgeWidth       = runscript mfid_OuterEdgeWidth       enddef ;
+newscriptindex mfid_PageOffset           ; mfid_PageOffset           := scriptindex "PageOffset"           ; vardef PageOffset           = runscript mfid_PageOffset           enddef ;
+newscriptindex mfid_PageDepth            ; mfid_PageDepth            := scriptindex "PageDepth"            ; vardef PageDepth            = runscript mfid_PageDepth            enddef ;
+newscriptindex mfid_LayoutColumns        ; mfid_LayoutColumns        := scriptindex "LayoutColumns"        ; vardef LayoutColumns        = runscript mfid_LayoutColumns        enddef ;
+newscriptindex mfid_LayoutColumnDistance ; mfid_LayoutColumnDistance := scriptindex "LayoutColumnDistance" ; vardef LayoutColumnDistance = runscript mfid_LayoutColumnDistance enddef ;
+newscriptindex mfid_LayoutColumnWidth    ; mfid_LayoutColumnWidth    := scriptindex "LayoutColumnWidth"    ; vardef LayoutColumnWidth    = runscript mfid_LayoutColumnWidth    enddef ;
+
+immutable % permanent
+    PaperHeight, PaperWidth, PrintPaperHeight, PrintPaperWidth, TopSpace,
+    BottomSpace, BackSpace, CutSpace, MakeupHeight, MakeupWidth, TopHeight,
+    TopDistance, HeaderHeight, HeaderDistance, TextHeight, FooterDistance,
+    FooterHeight, BottomDistance, BottomHeight, LeftEdgeWidth, LeftEdgeDistance,
+    LeftMarginWidth, LeftMarginDistance, TextWidth, RightMarginDistance,
+    RightMarginWidth, RightEdgeDistance, RightEdgeWidth, InnerMarginDistance,
+    InnerMarginWidth, OuterMarginDistance, OuterMarginWidth, InnerEdgeDistance,
+    InnerEdgeWidth, OuterEdgeDistance, OuterEdgeWidth, PageOffset, PageDepth,
+    LayoutColumns, LayoutColumnDistance, LayoutColumnWidth ;
+
+newscriptindex mfid_OnRightPage      ; mfid_OnRightPage      := scriptindex "OnRightPage"      ; vardef OnRightPage      = runscript mfid_OnRightPage      enddef ;
+newscriptindex mfid_OnOddPage        ; mfid_OnOddPage        := scriptindex "OnOddPage"        ; vardef OnOddPage        = runscript mfid_OnOddPage        enddef ;
+newscriptindex mfid_InPageBody       ; mfid_InPageBody       := scriptindex "InPageBody"       ; vardef InPageBody       = runscript mfid_InPageBody       enddef ;
+newscriptindex mfid_LayoutHasChanged ; mfid_LayoutHasChanged := scriptindex "LayoutHasChanged" ; vardef LayoutHasChanged = runscript mfid_LayoutHasChanged enddef ;
+
+immutable % permanent
+    OnRightPage, OnOddPage, InPageBody, LayoutHasChanged ;
+
+newscriptindex mfid_RealPageNumber ; mfid_RealPageNumber := scriptindex "RealPageNumber" ; vardef RealPageNumber= runscript mfid_RealPageNumber enddef ;
+newscriptindex mfid_LastPageNumber ; mfid_LastPageNumber := scriptindex "LastPageNumber" ; vardef LastPageNumber= runscript mfid_LastPageNumber enddef ;
+
+newscriptindex mfid_PageNumber     ; mfid_PageNumber     := scriptindex "PageNumber"     ; vardef PageNumber    = runscript mfid_PageNumber     enddef ;
+newscriptindex mfid_NOfPages       ; mfid_NOfPages       := scriptindex "NOfPages"       ; vardef NOfPages      = runscript mfid_NOfPages       enddef ;
+
+newscriptindex mfid_SubPageNumber  ; mfid_SubPageNumber  := scriptindex "SubPageNumber"  ; vardef SubPageNumber = runscript mfid_SubPageNumber  enddef ;
+newscriptindex mfid_NOfSubPages    ; mfid_NOfSubPages    := scriptindex "NOfSubPages"    ; vardef NOfSubPages   = runscript mfid_NOfSubPages    enddef ;
+
+newscriptindex mfid_CurrentColumn  ; mfid_CurrentColumn  := scriptindex "CurrentColumn"  ; vardef CurrentColumn = runscript mfid_CurrentColumn  enddef ;
+newscriptindex mfid_NOfColumns     ; mfid_NOfColumns     := scriptindex "NOfColumns"     ; vardef NOfColumns    = runscript mfid_NOfColumns     enddef ;
+
+immutable % permanent
+    RealPageNumber, LastPageNumber, PageNumber,
+    NOfPages, SubPageNumber, NOfSubPages, CurrentColumn, NOfColumns ;
+
+newscriptindex mfid_BaseLineSkip  ; mfid_BaseLineSkip  := scriptindex "BaseLineSkip"  ; vardef BaseLineSkip  = runscript mfid_BaseLineSkip         enddef ;
+newscriptindex mfid_LineHeight    ; mfid_LineHeight    := scriptindex "LineHeight"    ; vardef LineHeight    = runscript mfid_LineHeight           enddef ;
+newscriptindex mfid_BodyFontSize  ; mfid_BodyFontSize  := scriptindex "BodyFontSize"  ; vardef BodyFontSize  = runscript mfid_BodyFontSize         enddef ;
+
+newscriptindex mfid_TopSkip       ; mfid_TopSkip       := scriptindex "TopSkip"       ; vardef TopSkip       = runscript mfid_TopSkip              enddef ;
+newscriptindex mfid_StrutHeight   ; mfid_StrutHeight   := scriptindex "StrutHeight"   ; vardef StrutHeight   = runscript mfid_StrutHeight          enddef ;
+newscriptindex mfid_StrutDepth    ; mfid_StrutDepth    := scriptindex "StrutDepth"    ; vardef StrutDepth    = runscript mfid_StrutDepth           enddef ;
+
+newscriptindex mfid_CurrentWidth  ; mfid_CurrentWidth  := scriptindex "CurrentWidth"  ; vardef CurrentWidth  = runscript mfid_CurrentWidth         enddef ;
+newscriptindex mfid_CurrentHeight ; mfid_CurrentHeight := scriptindex "CurrentHeight" ; vardef CurrentHeight = runscript mfid_CurrentHeight        enddef ;
+
+newscriptindex mfid_HSize         ; mfid_HSize         := scriptindex "HSize"         ; vardef HSize         = runscript mfid_HSize                enddef ;
+newscriptindex mfid_VSize         ; mfid_VSize         := scriptindex "VSize"         ; vardef VSize         = runscript mfid_VSize                enddef ;
+
+newscriptindex mfid_EmWidth       ; mfid_EmWidth       := scriptindex "EmWidth"       ; vardef EmWidth       = runscript mfid_EmWidth              enddef ;
+newscriptindex mfid_ExHeight      ; mfid_ExHeight      := scriptindex "ExHeight"      ; vardef ExHeight      = runscript mfid_ExHeight             enddef ;
+
+immutable % permanent
+    BaseLineSkip, LineHeight, BodyFontSize, TopSkip, StrutHeight, StrutDepth,
+    CurrentWidth, CurrentHeight, HSize, VSize, EmWidth, ExHeight ;
+
+newscriptindex mfid_PageFraction ; mfid_PageFraction := scriptindex "PageFraction" ; vardef PageFraction = runscript mfid_PageFraction         enddef ;
+newscriptindex mfid_SpineWidth   ; mfid_SpineWidth   := scriptindex "SpineWidth"   ; vardef SpineWidth   = runscript mfid_SpineWidth           enddef ;
+newscriptindex mfid_PaperBleed   ; mfid_PaperBleed   := scriptindex "PaperBleed"   ; vardef PaperBleed   = runscript mfid_PaperBleed           enddef ;
+
+immutable % permanent
+    PageFraction, SpineWidth, PaperBleed ;
+
+%              mfid_CurrentLayout    ; mfid_CurrentLayout    := scriptindex "CurrentLayout"    ; vardef CurrentLayout    = runscript mfid_CurrentLayout        enddef ;
+%              mfid_OverlayLineColor ; mfid_OverlayLineColor := scriptindex "OverlayLineColor  ; vardef OverlayLineColor = runscript mfid_OverlayLineColor     enddef ;
+%              mfid_OverlayColor     ; mfid_OverlayColor     := scriptindex "OverlayColor      ; vardef OverlayColor     = runscript mfid_OverlayColor         enddef ;
+newscriptindex mfid_OverlayWidth     ; mfid_OverlayWidth     := scriptindex "OverlayWidth"     ; vardef OverlayWidth     = runscript mfid_OverlayWidth         enddef ;
+newscriptindex mfid_OverlayHeight    ; mfid_OverlayHeight    := scriptindex "OverlayHeight"    ; vardef OverlayHeight    = runscript mfid_OverlayHeight        enddef ;
+newscriptindex mfid_OverlayDepth     ; mfid_OverlayDepth     := scriptindex "OverlayDepth"     ; vardef OverlayDepth     = runscript mfid_OverlayDepth         enddef ;
+newscriptindex mfid_OverlayLineWidth ; mfid_OverlayLineWidth := scriptindex "OverlayLineWidth" ; vardef OverlayLineWidth = runscript mfid_OverlayLineWidth     enddef ;
+newscriptindex mfid_OverlayOffset    ; mfid_OverlayOffset    := scriptindex "OverlayOffset"    ; vardef OverlayOffset    = runscript mfid_OverlayOffset        enddef ;
+newscriptindex mfid_OverlayRegion    ; mfid_OverlayRegion    := scriptindex "OverlayRegion"    ; vardef OverlayRegion    = runscript mfid_OverlayRegion        enddef ;
+
+immutable % permanent
+  %  CurrentLayout, OverlayLineColor, OverlayColor,
+    OverlayWidth, OverlayHeight, OverlayDepth, OverlayLineWidth, OverlayOffset, OverlayRegion ;
+
+newscriptindex mfid_defaultcolormodel    ; mfid_defaultcolormodel    := scriptindex "defaultcolormodel"    ; vardef defaultcolormodel = runscript mfid_defaultcolormodel enddef ;
+
+immutable % permanent
+    defaultcolormodel ;
 
 vardef LeftMarginWidth     = if mfun_swapped and not OnRightPage : runscript mfid_RightMarginWidth    else : runscript mfid_LeftMarginWidth     fi enddef ;
 vardef RightMarginWidth    = if mfun_swapped and not OnRightPage : runscript mfid_LeftMarginWidth     else : runscript mfid_RightMarginWidth    fi enddef ;
@@ -153,6 +187,12 @@ vardef OuterMargin = if not OnRightPage : LeftMargin  else : RightMargin fi endd
 vardef InnerMargin = if not OnRightPage : RightMargin else : LeftMargin  fi enddef ;
 
 vardef OuterEdge   = if not OnRightPage : LeftEdge    else : RightEdge   fi enddef ;
-vardef InnerEdge   = if not OnRightPage : Rightedge   else : LeftEdge    fi enddef ;
-
-
+vardef InnerEdge   = if not OnRightPage : RightEdge   else : LeftEdge    fi enddef ;
+
+immutable % permanent
+    LeftMarginWidth, RightMarginWidth, LeftMarginDistance, RightMarginDistance,
+    LeftEdgeWidth, RightEdgeWidth, LeftEdgeDistance, RightEdgeDistance, BackSpace,
+    CutSpace, OuterMarginWidth, InnerMarginWidth, OuterMarginDistance,
+    InnerMarginDistance, OuterEdgeWidth, InnerEdgeWidth, OuterEdgeDistance,
+    InnerEdgeDistance, OuterSpaceWidth, InnerSpaceWidth, OuterMargin, InnerMargin,
+    OuterEdge, InnerEdge ;
diff --git a/metapost/context/base/mpxl/mp-figs.mpxl b/metapost/context/base/mpxl/mp-figs.mpxl
new file mode 100644
index 000000000..b077056cb
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-figs.mpxl
@@ -0,0 +1,47 @@
+%D \module
+%D   [       file=mp-figs.mpiv,
+%D        version=2003.01.15,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=figures,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if known context_figs : endinput ; fi ;
+
+boolean context_figs ; context_figs := true ; immutable context_figs ;
+
+% todo: check defined
+
+def registerfigure(expr name,width,height) =
+    begingroup ;
+    save s ; string s ; s := cleanstring(name) ;
+    scantokens( s & "_width  := " & decimal(width )) ;
+    scantokens( s & "_height := " & decimal(height)) ;
+    endgroup ;
+enddef ;
+
+vardef figuresize(expr name) =
+    save s, p ; string s ; pair p ;
+    s := cleanstring(name) ;
+    scantokens( "p := " & "(" & s & "_width" & "," & s & "_height" & ")" ) ;
+    p
+enddef ;
+
+vardef figurewidth(expr name) =
+    xpart figuresize(name)
+enddef ;
+
+vardef figureheight(expr name) =
+    ypart figuresize(name)
+enddef ;
+
+let figuredimensions = figuresize ; % for old times sake
+
+def naturalfigure(expr name) =
+    externalfigure name xyscaled(figuresize(name))
+enddef ;
diff --git a/metapost/context/base/mpxl/mp-form.mpxl b/metapost/context/base/mpxl/mp-form.mpxl
new file mode 100644
index 000000000..fcd0c1137
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-form.mpxl
@@ -0,0 +1,28 @@
+%D \module
+%D   [       file=mp-form.mpiv,
+%D        version=2011.10.14,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=form support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+% The graph package will be replaced by our own variant using
+% MetaPost 2 features and textext.
+
+if known context_form : endinput ; fi ;
+
+boolean context_form ; context_form := true ; immutable context_form ;
+
+% The following function accept a number or string that can be
+% converted to a number by \LUA. The first argument is a format
+% where @ can be used instead of %. The number is typeset in math
+% mode and @3e is converted into @.3e.
+
+vardef mfun_format_number(expr fmt, i) =
+    "\ctxlua{metapost.formatnumber('" & fmt & "'," & if string i : i else : decimal i fi & ")}"
+enddef ;
diff --git a/metapost/context/base/mpxl/mp-func.mpxl b/metapost/context/base/mpxl/mp-func.mpxl
new file mode 100644
index 000000000..859e6ead3
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-func.mpxl
@@ -0,0 +1,87 @@
+%D \module
+%D   [       file=mp-func.mpiv,
+%D        version=2001.12.29,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=function hacks,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+%D Under construction.
+
+if known context_func : endinput ; fi ;
+
+boolean context_func ; context_func := true ; immutable context_func ;
+
+string mfun_pathconnectors[] ;
+
+mfun_pathconnectors[0] := ","   ;
+mfun_pathconnectors[1] := "--"  ;
+mfun_pathconnectors[2] := ".."  ;
+mfun_pathconnectors[3] := "..." ;
+mfun_pathconnectors[4] := "---" ;
+
+def pathconnectors = mfun_pathconnectors enddef ;
+
+vardef mfun_function (expr f) (expr u, t, b, e, s) =
+    save x ; numeric x ;
+    save c ; string c ; c := if string f : f else : mfun_pathconnectors[f] fi ;
+    for xx := b step s until e :
+        hide (x := xx ;)
+        if xx > b :
+          scantokens(c)
+        fi
+        (scantokens(u),scantokens(t))
+    endfor
+enddef ;
+
+def function            = mfun_function     enddef ; % let doesn't work here
+def constructedfunction = mfun_function     enddef ;
+def straightfunction    = mfun_function (1) enddef ;
+def curvedfunction      = mfun_function (2) enddef ;
+
+% def punkedfunction   = mfun_function (1) enddef ; % same as straightfunction
+% def tightfunction    = mfun_function (3) enddef ; % same as curvedfunction
+
+vardef mfun_constructedpath (expr f) (text t) =
+    save ok ; boolean ok ; ok := false ;
+    save c ; string c ; c := if string f : f else : mfun_pathconnectors[f] fi ;
+    for i=t :
+        if ok :
+            scantokens(c)
+        else :
+            ok := true ;
+        fi
+        i
+    endfor
+enddef ;
+
+def constructedpath = mfun_constructedpath     enddef ; % let doesn't work here
+def straightpath    = mfun_constructedpath (1) enddef ;
+def curvedpath      = mfun_constructedpath (2) enddef ;
+
+% def punkedpath      = mfun_constructedpath (1) enddef ; % same as straightpath
+% def tightpath       = mfun_constructedpath (3) enddef ; % same as curvedpath
+
+vardef mfun_constructedpairs (expr f) (text p) =
+    save i ; i := -1 ;
+    save c ; string c ; c := if string f : f else : mfun_pathconnectors[f] fi ;
+    forever :
+        exitif unknown p[incr(i)] ;
+        if i>0 :
+            scantokens(c)
+        fi
+        p[i]
+    endfor
+enddef ;
+
+def constructedpairs = mfun_constructedpairs     enddef ; % let doesn't work here
+def straightpairs    = mfun_constructedpairs (1) enddef ;
+def curvedpairs      = mfun_constructedpairs (2) enddef ;
+
+% def punkedpairs      = mfun_constructedpairs (1) enddef ; % same as straightpairs
+% def tightpairs       = mfun_constructedpairs (3) enddef ; % same as curvedpairs
diff --git a/metapost/context/base/mpxl/mp-grid.mpxl b/metapost/context/base/mpxl/mp-grid.mpxl
new file mode 100644
index 000000000..466d82555
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-grid.mpxl
@@ -0,0 +1,142 @@
+%D \module
+%D   [       file=mp-grid.mpiv,
+%D        version=2000.07.10,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=grid support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+%D Under construction.
+
+if known context_grid : endinput ; fi ;
+
+boolean context_grid ; context_grid := true ; immutable context_grid ;
+
+string  fmt_separator  ; fmt_separator  := "@" ;
+numeric fmt_precision  ; fmt_precision  := 3 ;
+boolean fmt_initialize ; fmt_initialize := false ;
+boolean fmt_zerocheck  ; fmt_zerocheck  := true ;
+
+if unknown fmt_loaded : input "mp-form.mpxl" ; fi ;
+
+boolean fmt_pictures ; fmt_pictures := true ;
+
+def  do_format = if fmt_pictures :  format else :  formatstr fi enddef ;
+def do_mformat = if fmt_pictures : Mformat else : Mformatstr fi enddef ;
+
+numeric grid_eps ; grid_eps = eps ;
+
+def hlingrid (expr asked_min, asked_max, asked_step, asked_length, asked_width) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw (origin--(asked_width,0)) shifted (0,i*(asked_length/asked_max)) t ;
+        endfor ;
+    ) ;
+enddef ;
+
+def vlingrid (expr asked_min, asked_max, asked_step, asked_length, asked_height) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw (origin--(0,asked_height)) shifted (i*(asked_length/asked_max),0) t ;
+        endfor ;
+    ) ;
+enddef ;
+
+def hloggrid (expr asked_min, asked_max, asked_step, asked_length, asked_width) text t =
+    image (
+        for i=max(asked_min,1) step asked_step until min(asked_max,10)+grid_eps :
+            draw (origin--(asked_width,0)) shifted (0,asked_length*log(i)) t ;
+        endfor ;
+    ) ;
+enddef ;
+
+def vloggrid (expr asked_min, asked_max, asked_step, asked_length, asked_height) text t =
+    image (
+        for i=max(asked_min,1) step asked_step until min(asked_max,10)+grid_eps :
+            draw (origin--(0,asked_height)) shifted (asked_length*log(i),0) t ;
+        endfor ;
+    ) ;
+enddef ;
+
+vardef hlintext@#(expr asked_min, asked_max, asked_step, asked_length, asked_format) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw textext@#(mfun_format_number(asked_format,i)) shifted (0,i*(asked_length/asked_max)) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef vlintext@#(expr asked_min, asked_max, asked_step, asked_length, asked_format) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw textext@#(mfun_format_number(asked_format,i)) shifted (i*(asked_length/asked_max),0) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef hlogtext@#(expr asked_min, asked_max, asked_step, asked_length, asked_format) text t =
+    image (
+        for i=max(asked_min,1) step asked_step until min(asked_max,10)+grid_eps :
+            draw textext@#(mfun_format_number(asked_format,i)) shifted (0,asked_length*log(i)) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef vlogtext@#(expr asked_min, asked_max, asked_step, asked_length, asked_format) text t =
+    image (
+        for i=max(asked_min,1) step asked_step until min(asked_max,10)+grid_eps :
+            draw textext@#(mfun_format_number(asked_format,i)) shifted (asked_length*log(i),0) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef hlinlabel@#(expr asked_min, asked_max, asked_step, asked_length) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw thelabel@#(decimal i,(0,i*(asked_length/asked_max))) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef vlinlabel@#(expr asked_min, asked_max, asked_step, asked_length) text t =
+    image (
+        for i=asked_min step asked_step until asked_max+grid_eps :
+            draw thelabel@#(decimal i,(i*(asked_length/asked_max),0)) t ;
+        endfor ;
+    )
+enddef ;
+
+vardef linlog(expr xy) = (    xpart xy,  log(ypart xy)) enddef ;
+vardef loglin(expr xy) = (log(xpart xy),     ypart xy)  enddef ;
+vardef loglog(expr xy) = (log(xpart xy), log(ypart xy)) enddef ;
+vardef linlin(expr xy) = (   (xpart xy),    (ypart xy)) enddef ;
+
+vardef loglinpath primary p = processpath (p) (loglin) enddef ;
+vardef linlogpath primary p = processpath (p) (linlog) enddef ;
+vardef loglogpath primary p = processpath (p) (loglog) enddef ;
+vardef linlinpath primary p = processpath (p) (linlin) enddef ;
+
+vardef processpath (expr p) (text pp) =
+    if path p :
+        for i=0 upto length(p)-1 :
+            pp(point       i    of p) .. controls
+            pp(postcontrol i    of p) and
+            pp(precontrol (i+1) of p) ..
+        endfor
+        if cycle p :
+            cycle
+        else :
+            pp(point length(p) of p)
+        fi
+    elseif pair p :
+        pp(p)
+    else :
+        p
+    fi
+enddef ;
+
diff --git a/metapost/context/base/mpxl/mp-grph.mpxl b/metapost/context/base/mpxl/mp-grph.mpxl
new file mode 100644
index 000000000..bfe8304fd
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-grph.mpxl
@@ -0,0 +1,207 @@
+%D \module
+%D   [       file=mp-grph.mpiv,
+%D        version=2000.12.14,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=graphic text support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+%D Under construction.
+
+if known context_grph : endinput ; fi ;
+
+boolean context_grph ; context_grph := true ; immutable context_grph ;
+
+numeric mfun_fig_nesting ; mfun_fig_nesting := 0 ;
+
+def beginfig (expr c) =
+    mfun_fig_nesting := mfun_fig_nesting + 1 ;
+    if mfun_fig_nesting = 1 :
+        begingroup
+        charcode := c ;
+        resetfig ;
+        scantokens extra_beginfig ;
+    fi ;
+enddef ;
+
+def endfig =
+    ; % safeguard
+    if mfun_fig_nesting = 1 :
+        scantokens extra_endfig ;
+        shipit ;
+        endgroup ;
+    fi ;
+    mfun_fig_nesting := mfun_fig_nesting - 1 ;
+enddef;
+
+def resetfig =
+    clearxy ;
+    clearit ;
+    clearpen ;
+    pickup defaultpen ;
+    interim linecap := linecap ;
+    interim linejoin := linejoin ;
+    interim miterlimit := miterlimit ;
+    % not really needed:
+    save temp_b ; color temp_b ; temp_b := background ;
+    save background ; color background ; background := temp_b ;
+    %
+    drawoptions () ;
+enddef ;
+
+permanent beginfig, endfig, resetfig ;
+
+def protectgraphicmacros =
+    save showtext ;
+    save beginfig ; let beginfig = begingraphictextfig ;
+    save endfig   ; let endfig   = endgraphictextfig ;
+    save end      ; let end      = relax ;
+    resetfig ; % resets currentpicture
+enddef ;
+
+numeric currentgraphictext ; currentgraphictext := 0 ;
+
+def begingraphictextfig (expr n) =
+    foundpicture := n ;
+    scratchpicture := nullpicture ;
+enddef ;
+
+def endgraphictextfig =
+    if foundpicture = currentgraphictext :
+        expandafter endinput
+    else :
+        scratchpicture := nullpicture ;
+    fi ;
+enddef ;
+
+def loadfigure primary filename =
+    mfun_load_figure(filename)
+enddef ;
+
+def mfun_load_figure (expr filename) text figureattributes =
+    begingroup ;
+    save figurenumber, figurepicture, number, fixedplace ;
+    numeric figurenumber  ; figurenumber := 0 ;
+    boolean figureshift ; figureshift := true ;
+    picture figurepicture ; figurepicture := currentpicture ;
+    def number primary n = hide(figurenumber := n) enddef ;
+    def fixedplace = hide(figureshift := false) enddef ;
+    protectgraphicmacros ;
+    % defaults
+    interim linecap    := rounded ;
+    interim linejoin   := rounded ;
+    interim miterlimit := 10 ;
+    %
+    currentpicture := nullpicture ;
+    draw fullcircle figureattributes ; % expand number
+    currentpicture := nullpicture ;
+    def beginfig (expr n) =
+        currentpicture := nullpicture ;
+        if (figurenumber=n) or (figurenumber=0) :
+            let endfig = endinput ;
+        fi ;
+    enddef ;
+    let endfig = relax ;
+    readfile(filename) ;
+    if figureshift :
+        currentpicture := currentpicture shifted -llcorner currentpicture ;
+    fi ;
+    addto figurepicture also currentpicture figureattributes ;
+    currentpicture := figurepicture  ;
+    endgroup ;
+enddef ;
+
+% We only use the new method now.
+
+boolean mfun_gt_color_fill ;
+boolean mfun_gt_color_draw ;
+boolean mfun_gt_shade_fill ;
+boolean mfun_gt_reverse_fill ;
+boolean mfun_gt_outline_fill ;
+picture mfun_gt_picture ;
+
+def mfun_gt_default = % somewhat compatible
+    scaled 11.5
+    withpen pencircle scaled .1
+enddef ;
+
+def graphictext primary t = % use outlinetext instead
+    begingroup ;
+    mfun_graphic_text_indeed(t)
+enddef ;
+
+def mfun_graphic_text_indeed(expr t) text rest =
+    interim linecap    := butt ;     % normally rounded
+    interim linejoin   := mitered ;  % normally rounded
+  % interim miterlimit := 10 ;       % todo
+    %
+    let normalwithshade = withshade ;
+    %
+    save reversefill, outlinefill, withshade, withfillcolor, withdrawcolor ;
+    %
+    def mfun_gt_fill  = enddef ;
+    def mfun_gt_draw  = enddef ;
+    def mfun_gt_shade = enddef ;
+    %
+    mfun_gt_color_fill   := false ;
+    mfun_gt_color_draw   := false ;
+    mfun_gt_shade_fill   := false ;
+    mfun_gt_reverse_fill := false ;
+    %
+    def reversefill = hide(mfun_gt_reverse_fill := true) enddef ;
+    def outlinefill = enddef ;
+    def withshade     primary c = hide(mfun_gt_shade_fill := true; def mfun_gt_shade = normalwithshade c enddef ;) enddef ;
+    def withfillcolor primary c = hide(mfun_gt_color_fill := true; def mfun_gt_fill  = withcolor c       enddef ;) enddef ;
+    def withdrawcolor primary c = hide(mfun_gt_color_draw := true; def mfun_gt_draw  = withcolor c       enddef ;) enddef ;
+    %
+    mfun_gt_picture := nullpicture ;
+    addto mfun_gt_picture doublepath origin rest ; % preroll
+    mfun_gt_picture := nullpicture ;
+    %
+    def reversefill = enddef ;
+    def outlinefill = enddef ;
+    def withshade     primary c = enddef ;
+    def withfillcolor primary c = enddef ;
+    def withdrawcolor primary c = enddef ;
+    %
+    if mfun_gt_shade_fill :
+        draw outlinetext.f(t)(mfun_gt_shade) rest;
+    elseif mfun_gt_color_fill and mfun_gt_color_draw :
+        if mfun_gt_reverse_fill :
+            draw outlinetext.r(t)(mfun_gt_default mfun_gt_fill)(mfun_gt_default mfun_gt_draw) rest;
+        else :
+            draw outlinetext.b(t)(mfun_gt_default mfun_gt_draw)(mfun_gt_default mfun_gt_fill) rest;
+        fi ;
+    elseif mfun_gt_color_fill :
+        draw outlinetext.f(t)(mfun_gt_default mfun_gt_fill) rest;
+    elseif mfun_gt_color_draw :
+        draw outlinetext.d(t)(mfun_gt_default mfun_gt_draw) rest ;
+    else :
+        draw outlinetext.d(t)(mfun_gt_default) rest ;
+    fi ;
+    %
+    endgroup ;
+enddef ;
+
+% example
+%
+% beginfig (1) ;
+%     graphictext
+%         "\vbox{\hsize10cm \input tufte }"
+%         scaled 8
+%         withdrawcolor blue
+%         withfillcolor red
+%         withpen pencircle scaled 2pt ;
+% endfig ;
+%
+% beginfig(1) ;
+%       loadfigure "gracht.mp" rotated 20 ;
+%       loadfigure "koe.mp" number 1 scaled 2 ;
+% endfig ;
+%
+% end
diff --git a/metapost/context/base/mpxl/mp-lmtx.mpxl b/metapost/context/base/mpxl/mp-lmtx.mpxl
index 1f70d0ac1..4b2ed7940 100644
--- a/metapost/context/base/mpxl/mp-lmtx.mpxl
+++ b/metapost/context/base/mpxl/mp-lmtx.mpxl
@@ -16,7 +16,7 @@
 
 if known context_lmtx : endinput ; fi ;
 
-boolean context_lmtx ; context_lmtx := true ;
+boolean context_lmtx ; context_lmtx := true ; immutable context_lmtx ;
 
 presetparameters "text" [
     offset     = 0,
@@ -354,12 +354,12 @@ def lmt_followtext = applyparameters "followtext" "lmt_do_followtext" enddef ;
 vardef lmt_do_followtext =
     image (
         pushparameters "followtext" ;
-        save s_u ; string s_u ; s_u := getparameter "autoscaleup" ;
-        save s_d ; string s_d ; s_d := getparameter "autoscaledown" ;
+        save scale_up   ; string scale_up   ; scale_up   := getparameter "autoscaleup" ;
+        save scale_down ; string scale_down ; scale_down := getparameter "autoscaledown" ;
         save followtextalternative   ; followtextalternative   := if getparameter "spread" : 1 else : 0 fi ;
-        save tracingfollowtext       ; tracingfollowtext       := if getparameter "trace"  : 1 else : 0 fi ;
-        save autoscaleupfollowtext   ; autoscaleupfollowtext   := if s_u = "yes" : 1 elseif s_u = "max" : 2 else : 0 fi ;
-        save autoscaledownfollowtext ; autoscaledownfollowtext := if s_d = "yes" : 1 elseif s_d = "max" : 2 else : 0 fi ;
+        save tracingfollowtext       ; tracingfollowtext          := if getparameter "trace"  : 1 else : 0 fi ;
+        save autoscaleupfollowtext   ; autoscaleupfollowtext   := if scale_up   = "yes" : 1 elseif scale_up   = "max" : 2 else : 0 fi ;
+        save autoscaledownfollowtext ; autoscaledownfollowtext := if scale_down = "yes" : 1 elseif scale_down = "max" : 2 else : 0 fi ;
         draw followtext (
             if (getparameter "reverse") : reverse fi (getparameter "path"),
                 getparameter "text"
@@ -992,6 +992,8 @@ vardef OverlayMesh(expr p, s) =
     lmt_mesh [ paths = { meshed(p,OverlayBox,s) } ]
 enddef ;
 
+permanent meshed, OverlayMesh ;
+
 % charts
 
 presetparameters "chart" [
@@ -1391,33 +1393,34 @@ vardef lmt_do_shade =
             color_b := getparameter "colors" 2 ;
         fi
         if hasparameter "direction" :
-            save a, b, bb ; path bb ;
+            save a, b, bb, temp_x, temp_y ; path bb ;
+            temp_x := temp_y := 0 ;
             bb := boundingbox(mfun_shade_path) ;
             a := b := -1 ;
             if string getparameter "direction" :
                 s := getparameter "direction" ;
                 if     s = "up"    :
-                    p_a := xpart shadedup ;
-                    p_b := ypart shadedup ;
+                    temp_x := xpart shadedup ;
+                    temp_y := ypart shadedup ;
                 elseif s = "down"  :
-                    p_a := xpart shadeddown ;
-                    p_b := ypart shadeddown ;
+                    temp_x := xpart shadeddown ;
+                    temp_y := ypart shadeddown ;
                 elseif s = "left"  :
-                    p_a := xpart shadedleft ;
-                    p_b := ypart shadedleft ;
+                    temp_x := xpart shadedleft ;
+                    temp_y := ypart shadedleft ;
                 elseif s = "right" :
-                    p_a := xpart shadedright ;
-                    p_b := ypart shadedright ;
+                    temp_x := xpart shadedright ;
+                    temp_y := ypart shadedright ;
                 fi
             else :
-                p_a := getparameter "direction" 1 ;
-                p_a := getparameter "direction" 2 ;
+                temp_x := getparameter "direction" 1 ;
+                temp_y := getparameter "direction" 2 ;
             fi
-            if p_a >= 0 :
-                center_a := point p_a of bb ;
+            if temp_x >= 0 :
+                center_a := point temp_x of bb ;
             fi
-            if p_b >= 0 :
-                center_b := point p_b of bb ;
+            if temp_y >= 0 :
+                center_b := point temp_y of bb ;
             fi
         fi ;
         if hasparameter "center" :
@@ -2082,6 +2085,8 @@ vardef svggray(expr s) =
     s
 enddef ;
 
+permanent svgforcecmyk, svgcolor, svgcmyk, svggray ;
+
 presetparameters "svg" [
     filename = "",
     fontname = "",
@@ -2212,12 +2217,15 @@ presetparameters "mpsglyph" [
 def lmt_registerglyphs = applyparameters "mpsglyphs" "lmt_do_registerglyphs" enddef ;
 def lmt_registerglyph  = applyparameters "mpsglyph"  "lmt_do_registerglyph"  enddef ;
 
-vardef lmt_do_registerglyphs = lua.mp.lmt_register_glyphs() ; enddef ;
-vardef lmt_do_registerglyph  = lua.mp.lmt_register_glyph () ; enddef ;
+newscriptindex mfid_registerglyphs ; mfid_registerglyphs := scriptindex "registerglyphs" ; def lmt_do_registerglyphs = runscript mfid_registerglyphs enddef ;
+newscriptindex mfid_registerglyph  ; mfid_registerglyph  := scriptindex "registerglyph " ; def lmt_do_registerglyph  = runscript mfid_registerglyph  enddef ;
+
+% vardef lmt_do_registerglyphs = lua.mp.lmt_register_glyphs() ; enddef ;
+% vardef lmt_do_registerglyph  = lua.mp.lmt_register_glyph () ; enddef ;
 
 % Again an experiment (todo: the faster method):
 
-def lmt_remaptext = runscript("mp.lmt_do_remaptext()") enddef ;
+newscriptindex mfid_remaptext ; mfid_remaptext := scriptindex "remaptext" ; def lmt_remaptext = runscript mfid_remaptext enddef ;
 
 triplet mfun_tt_s ;
 
@@ -2225,9 +2233,9 @@ vardef rawmaptext(expr s) =
     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 := lua.mp.mf_map_text(mfun_tt_n,s,catcoderegime) ;
-    mfun_tt_s := lua.mp.mf_map_move(mfun_tt_n) ;
+    addto mfun_tt_o doublepath origin base_draw_options ;
+    mfun_tt_r := lua.mp.mf_map_text(mfun_tt_n,s,catcoderegime) ; % can become mfid_maptext
+    mfun_tt_s := lua.mp.mf_map_move(mfun_tt_n) ;                 % can become mfid_mapmove
     addto mfun_tt_c doublepath unitsquare
         xscaled wdpart mfun_tt_r
         yscaled (htpart mfun_tt_r + dppart mfun_tt_r)
@@ -2279,3 +2287,13 @@ vardef lmt_do_poisson =
         popparameters ;
     )
 enddef ;
+
+permanent
+    lmt_text, lmt_grid, lmt_axis, lmt_outline, lmt_followtext,
+    lmt_arrow, lmt_placeholder, % lmt_path,
+    lmt_function, lmt_poisson, lmt_mesh,
+    lmt_chart_circle, lmt_chart_histogram, lmt_chart_bar,
+    lmt_shade, lmt_contour, lmt_svg, lmt_surface,
+    lmt_registerglyphs, lmt_registerglyph,
+    lmt_remaptext, rawmaptext, svgtext, svg,
+    OverlayMesh ;
diff --git a/metapost/context/base/mpxl/mp-luas.mpxl b/metapost/context/base/mpxl/mp-luas.mpxl
index f3cb7e27a..14da16289 100644
--- a/metapost/context/base/mpxl/mp-luas.mpxl
+++ b/metapost/context/base/mpxl/mp-luas.mpxl
@@ -22,10 +22,11 @@ if known context_luas : endinput ; fi ;
 % other metafun modules too. Of course in retrospect I should have done this five
 % years earlier.
 
-boolean context_luas ; context_luas := true ;
+boolean context_luas ; context_luas := true ; immutable context_luas ;
 
-newinternal mfid_scriptindex ;
-mfid_scriptindex := runscript("mp.mf_script_index('scriptindex')") ;
+def newscriptindex suffix t = newinternal t ; immutable t ; enddef ;
+
+newscriptindex mfid_scriptindex ; mfid_scriptindex := runscript("mp.mf_script_index('scriptindex')") ;
 
 def scriptindex = runscript mfid_scriptindex enddef ;
 
@@ -115,6 +116,8 @@ def message expr t =
     lua.mp.report(tostring(t)) ;
 enddef ;
 
+permanent newscriptindex, scriptindex, luacall, lua, lualist, mp, MP  ;
+
 % Color:
 
 % We do a low level runscript:
@@ -123,32 +126,40 @@ enddef ;
 % lua.mp.mf_named_color(s)   % okay but, can also be
 % lua.mp("mf_named_color",s) % which gives expansion mess
 
-newinternal mfid_resolvedcolor ; mfid_resolvedcolor := scriptindex "namedcolor" ;
+newscriptindex mfid_resolvedcolor ; mfid_resolvedcolor := scriptindex "namedcolor" ;
 
 def resolvedcolor = runscript mfid_resolvedcolor enddef ;
 
+permanent resolvedcolor ;
+
 % Modes:
 
 vardef texmode   (expr s) = lua.mp("mode",      s) enddef ;
 vardef systemmode(expr s) = lua.mp("systemmode",s) enddef ;
 
+permanent texmode, systemmode ;
+
 % A few helpers
 
 vardef isarray   suffix a = lua.mp.isarray  (str a) enddef ;
 vardef prefix    suffix a = lua.mp.prefix   (str a) enddef ;
 vardef dimension suffix a = lua.mp.dimension(str a) enddef ;
 
+permanent isarray, prefix, dimension ;
+
 % More access
 
-newinternal mfid_getmacro ; mfid_getmacro := scriptindex "getmacro" ; def getmacro = runscript mfid_getmacro enddef ;
-newinternal mfid_getdimen ; mfid_getdimen := scriptindex "getdimen" ; def getdimen = runscript mfid_getdimen enddef ;
-newinternal mfid_getcount ; mfid_getcount := scriptindex "getcount" ; def getcount = runscript mfid_getcount enddef ;
-newinternal mfid_gettoks  ; mfid_gettoks  := scriptindex "gettoks"  ; def gettoks  = runscript mfid_gettoks  enddef ;
+newscriptindex mfid_getmacro ; mfid_getmacro := scriptindex "getmacro" ; def getmacro = runscript mfid_getmacro enddef ;
+newscriptindex mfid_getdimen ; mfid_getdimen := scriptindex "getdimen" ; def getdimen = runscript mfid_getdimen enddef ;
+newscriptindex mfid_getcount ; mfid_getcount := scriptindex "getcount" ; def getcount = runscript mfid_getcount enddef ;
+newscriptindex mfid_gettoks  ; mfid_gettoks  := scriptindex "gettoks"  ; def gettoks  = runscript mfid_gettoks  enddef ;
+
+newscriptindex mfid_setmacro ; mfid_setmacro := scriptindex "setmacro" ; def setmacro = runscript mfid_setmacro enddef ;
+newscriptindex mfid_setdimen ; mfid_setdimen := scriptindex "setdimen" ; def setdimen = runscript mfid_setdimen enddef ;
+newscriptindex mfid_setcount ; mfid_setcount := scriptindex "setcount" ; def setcount = runscript mfid_setcount enddef ;
+newscriptindex mfid_settoks  ; mfid_settoks  := scriptindex "settoks"  ; def settoks  = runscript mfid_settoks  enddef ;
 
-newinternal mfid_setmacro ; mfid_setmacro := scriptindex "setmacro" ; def setmacro = runscript mfid_setmacro enddef ;
-newinternal mfid_setdimen ; mfid_setdimen := scriptindex "setdimen" ; def setdimen = runscript mfid_setdimen enddef ;
-newinternal mfid_setcount ; mfid_setcount := scriptindex "setcount" ; def setcount = runscript mfid_setcount enddef ;
-newinternal mfid_settoks  ; mfid_settoks  := scriptindex "settoks"  ; def settoks  = runscript mfid_settoks  enddef ;
+permanent getmacro, getdimen, getcount, gettoks, setmacro, setdimen, setcount, settoks ;
 
 vardef positionpath  (expr name) = lua.mp.positionpath  (name) enddef ;
 vardef positioncurve (expr name) = lua.mp.positioncurve (name) enddef ;
@@ -160,10 +171,6 @@ vardef positionregion(expr name) = lua.mp.positionregion(name) enddef ;
 vardef positionbox   (expr name) = lua.mp.positionbox   (name) enddef ;
 vardef positionanchor            = lua.mp.positionanchor()     enddef ;
 
-let wdpart     = redpart ;
-let htpart     = greenpart ;
-let dppart     = bluepart ;
-
 vardef positioninregion =
     currentpicture := currentpicture shifted - positionxy(positionanchor) ;
 enddef ;
@@ -172,14 +179,23 @@ vardef positionatanchor(expr name) =
     currentpicture := currentpicture shifted - positionxy(name) ;
 enddef ;
 
+permanent positionpath, positioncurve, positionxy, positionpxy, positionwhd, positionpage,
+    positionregion, positionbox, positionanchor, positioninregion, positionatanchor ;
+
+let wdpart = redpart ;
+let htpart = greenpart ;
+let dppart = bluepart ;
+
+permanent wdpart, htpart, dppart;
+
 vardef texvar(expr name) = lua.mp.texvar(name) enddef ;
 vardef texstr(expr name) = lua.mp.texstr(name) enddef ;
 
-newinternal mfid_path_lengthof ; mfid_path_lengthof := scriptindex "pathlengthof" ;
-newinternal mfid_path_pointof  ; mfid_path_pointof  := scriptindex "pathpointof" ;
-newinternal mfid_path_leftof   ; mfid_path_leftof   := scriptindex "pathleftof" ;
-newinternal mfid_path_rightof  ; mfid_path_rightof  := scriptindex "pathrightof" ;
-newinternal mfid_path_reset    ; mfid_path_reset    := scriptindex "pathreset" ;
+newscriptindex mfid_path_lengthof ; mfid_path_lengthof := scriptindex "pathlengthof" ;
+newscriptindex mfid_path_pointof  ; mfid_path_pointof  := scriptindex "pathpointof" ;
+newscriptindex mfid_path_leftof   ; mfid_path_leftof   := scriptindex "pathleftof" ;
+newscriptindex mfid_path_rightof  ; mfid_path_rightof  := scriptindex "pathrightof" ;
+newscriptindex mfid_path_reset    ; mfid_path_reset    := scriptindex "pathreset" ;
 
 % 25 pct gain
 
@@ -188,6 +204,8 @@ vardef pointof primary i =                  runscript mfid_path_pointof  i endde
 vardef leftof  primary i =                  runscript mfid_path_leftof   i enddef ;
 vardef rightof primary i =                  runscript mfid_path_rightof  i enddef ;
 
+permanent inpath, pointof, leftof, rightof ;
+
 % another 10 pct gain
 
 % def inpath   = = 1 step 1 until runscript mfid_path_lengthof enddef ;
@@ -197,8 +215,8 @@ vardef rightof primary i =                  runscript mfid_path_rightof  i endde
 
 extra_endfig := extra_endfig & " runscript mfid_path_reset ; " ;
 
-newinternal mfid_utflen ; mfid_utflen := scriptindex "utflen" ;
-newinternal mfid_utfsub ; mfid_utfsub := scriptindex "utfsub" ;
+newscriptindex mfid_utflen ; mfid_utflen := scriptindex "utflen" ;
+newscriptindex mfid_utfsub ; mfid_utfsub := scriptindex "utfsub" ;
 
 % def utflen = runscript mfid_utflen enddef ;
 % def utfsub = runscript mfid_utfsub enddef ;
@@ -206,21 +224,23 @@ newinternal mfid_utfsub ; mfid_utfsub := scriptindex "utfsub" ;
 vardef utflen(expr s) = runscript mfid_utflen s enddef ; % str
 vardef utfsub(text t) = runscript mfid_utfsub t enddef ; % str, first, (optional) last
 
-newinternal mfid_getparameters        ; mfid_getparameters        := scriptindex "getparameters" ;
-newinternal mfid_presetparameters     ; mfid_presetparameters     := scriptindex "presetparameters" ;
-newinternal mfid_hasparameter         ; mfid_hasparameter         := scriptindex "hasparameter" ;
-newinternal mfid_hasoption            ; mfid_hasoption            := scriptindex "hasoption" ;
-newinternal mfid_getparameter         ; mfid_getparameter         := scriptindex "getparameter" ;
-newinternal mfid_getparameterdefault  ; mfid_getparameterdefault  := scriptindex "getparameterdefault" ;
-newinternal mfid_getparametercount    ; mfid_getparametercount    := scriptindex "getparametercount" ;
-newinternal mfid_getmaxparametercount ; mfid_getmaxparametercount := scriptindex "getmaxparametercount" ;
-newinternal mfid_getparameterpath     ; mfid_getparameterpath     := scriptindex "getparameterpath" ;
-newinternal mfid_getparameterpen      ; mfid_getparameterpen      := scriptindex "getparameterpen" ;
-newinternal mfid_getparametertext     ; mfid_getparametertext     := scriptindex "getparametertext" ;
-%%%%%%%%%%% 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" ;
+permanent utflen, utfsub ;
+
+newscriptindex mfid_getparameters        ; mfid_getparameters        := scriptindex "getparameters" ;
+newscriptindex mfid_presetparameters     ; mfid_presetparameters     := scriptindex "presetparameters" ;
+newscriptindex mfid_hasparameter         ; mfid_hasparameter         := scriptindex "hasparameter" ;
+newscriptindex mfid_hasoption            ; mfid_hasoption            := scriptindex "hasoption" ;
+newscriptindex mfid_getparameter         ; mfid_getparameter         := scriptindex "getparameter" ;
+newscriptindex mfid_getparameterdefault  ; mfid_getparameterdefault  := scriptindex "getparameterdefault" ;
+newscriptindex mfid_getparametercount    ; mfid_getparametercount    := scriptindex "getparametercount" ;
+newscriptindex mfid_getmaxparametercount ; mfid_getmaxparametercount := scriptindex "getmaxparametercount" ;
+newscriptindex mfid_getparameterpath     ; mfid_getparameterpath     := scriptindex "getparameterpath" ;
+newscriptindex mfid_getparameterpen      ; mfid_getparameterpen      := scriptindex "getparameterpen" ;
+newscriptindex mfid_getparametertext     ; mfid_getparametertext     := scriptindex "getparametertext" ;
+%              mfid_getparameteroption   ; mfid_getparameteroption   := scriptindex "getparameteroption" ;
+newscriptindex mfid_applyparameters      ; mfid_applyparameters      := scriptindex "applyparameters" ;
+newscriptindex mfid_pushparameters       ; mfid_pushparameters       := scriptindex "pushparameters" ;
+newscriptindex mfid_popparameters        ; mfid_popparameters        := scriptindex "popparameters" ;
 
 def getparameters        = runscript mfid_getparameters        enddef ;
 def presetparameters     = runscript mfid_presetparameters     enddef ;
@@ -233,24 +253,32 @@ def getmaxparametercount = runscript mfid_getmaxparametercount enddef ;
 def getparameterpath     = runscript mfid_getparameterpath     enddef ;
 def getparameterpen      = runscript mfid_getparameterpen      enddef ;
 def getparametertext     = runscript mfid_getparametertext     enddef ;
-%%% 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 ;
 
+permanent getparameters, presetparameters, hasparameter, hasoption, getparameter, getparameterdefault,
+    getparametercount, getmaxparametercount, getparameterpath, getparameterpen, getparametertext, % getparameteroption,
+    applyparameters, pushparameters, popparameters ;
+
 % This might also be done in stock mkiv:
 
-newinternal mfid_year   ; mfid_year   := scriptindex "year"   ; vardef year   = runscript mfid_year   enddef ;
-newinternal mfid_month  ; mfid_month  := scriptindex "month"  ; vardef month  = runscript mfid_month  enddef ;
-newinternal mfid_day    ; mfid_day    := scriptindex "day"    ; vardef day    = runscript mfid_day    enddef ;
-newinternal mfid_hour   ; mfid_hour   := scriptindex "hour"   ; vardef hour   = runscript mfid_hour   enddef ;
-newinternal mfid_minute ; mfid_minute := scriptindex "minute" ; vardef minute = runscript mfid_minute enddef ;
-newinternal mfid_second ; mfid_second := scriptindex "second" ; vardef second = runscript mfid_second enddef ;
+newscriptindex mfid_year   ; mfid_year   := scriptindex "year"   ; vardef year   = runscript mfid_year   enddef ;
+newscriptindex mfid_month  ; mfid_month  := scriptindex "month"  ; vardef month  = runscript mfid_month  enddef ;
+newscriptindex mfid_day    ; mfid_day    := scriptindex "day"    ; vardef day    = runscript mfid_day    enddef ;
+newscriptindex mfid_hour   ; mfid_hour   := scriptindex "hour"   ; vardef hour   = runscript mfid_hour   enddef ;
+newscriptindex mfid_minute ; mfid_minute := scriptindex "minute" ; vardef minute = runscript mfid_minute enddef ;
+newscriptindex mfid_second ; mfid_second := scriptindex "second" ; vardef second = runscript mfid_second enddef ;
+
+permanent year, month, day, hour, minute, second ; % overloaded
 
 % You cannot overload a local color bu using a prefix works ok:
 %
 % \definecolor [ name = "mp:myred", r = .9 ] ;
 
-newinternal mfid_definecolor ; mfid_definecolor := scriptindex "definecolor" ;
+newscriptindex mfid_definecolor ; mfid_definecolor := scriptindex "definecolor" ;
 
 def definecolor = runscript mfid_definecolor ; enddef ; % the semicolon prevents lookahead
+
+permanent definecolor ;
diff --git a/metapost/context/base/mpxl/mp-math.mpxl b/metapost/context/base/mpxl/mp-math.mpxl
index ea8c1cd7c..aabd4c658 100644
--- a/metapost/context/base/mpxl/mp-math.mpxl
+++ b/metapost/context/base/mpxl/mp-math.mpxl
@@ -13,111 +13,111 @@
 
 if known context_math : endinput ; fi ;
 
-boolean context_math ; context_math := true ;
+boolean context_math ; context_math := true ; immutable context_math ;
 
 % draw textext(decimal runscript("mp.numeric(xmath.gamma(.12))")) ;
 
-newinternal mfid_m_acos       ; mfid_m_acos       := scriptindex "m_acos"       ; def m_acos      = runscript mfid_m_acos      enddef ;
-newinternal mfid_m_acosh      ; mfid_m_acosh      := scriptindex "m_acosh"      ; def m_acosh     = runscript mfid_m_acosh     enddef ;
-newinternal mfid_m_asin       ; mfid_m_asin       := scriptindex "m_asin"       ; def m_asin      = runscript mfid_m_asin      enddef ;
-newinternal mfid_m_asinh      ; mfid_m_asinh      := scriptindex "m_asinh"      ; def m_asinh     = runscript mfid_m_asinh     enddef ;
-newinternal mfid_m_atan       ; mfid_m_atan       := scriptindex "m_atan"       ; def m_atan      = runscript mfid_m_atan      enddef ;
-newinternal mfid_m_atantwo    ; mfid_m_atantwo    := scriptindex "m_atan2"      ; def m_atantwo   = runscript mfid_m_atantwo   enddef ; % atan2
-newinternal mfid_m_atanh      ; mfid_m_atanh      := scriptindex "m_atanh"      ; def m_atanh     = runscript mfid_m_atanh     enddef ;
-newinternal mfid_m_cbrt       ; mfid_m_cbrt       := scriptindex "m_cbrt"       ; def m_cbrt      = runscript mfid_m_cbrt      enddef ;
-newinternal mfid_m_ceil       ; mfid_m_ceil       := scriptindex "m_ceil"       ; def m_ceil      = runscript mfid_m_ceil      enddef ;
-newinternal mfid_m_copysign   ; mfid_m_copysign   := scriptindex "m_copysign"   ; def m_copysign  = runscript mfid_m_copysign  enddef ;
-newinternal mfid_m_cos        ; mfid_m_cos        := scriptindex "m_cos"        ; def m_cos       = runscript mfid_m_cos       enddef ;
-newinternal mfid_m_cosh       ; mfid_m_cosh       := scriptindex "m_cosh"       ; def m_cosh      = runscript mfid_m_cosh      enddef ;
-newinternal mfid_m_deg        ; mfid_m_deg        := scriptindex "m_deg"        ; def m_deg       = runscript mfid_m_deg       enddef ;
-newinternal mfid_m_erf        ; mfid_m_erf        := scriptindex "m_erf"        ; def m_erf       = runscript mfid_m_erf       enddef ;
-newinternal mfid_m_erfc       ; mfid_m_erfc       := scriptindex "m_erfc"       ; def m_erfc      = runscript mfid_m_erfc      enddef ;
-newinternal mfid_m_exp        ; mfid_m_exp        := scriptindex "m_exp"        ; def m_exp       = runscript mfid_m_exp       enddef ;
-newinternal mfid_m_exptwo     ; mfid_m_exptwo     := scriptindex "m_exp2"       ; def m_exptwo    = runscript mfid_m_exptwo    enddef ; % exp2
-newinternal mfid_m_expm       ; mfid_m_expm       := scriptindex "m_expm1"      ; def m_expm      = runscript mfid_m_expm      enddef ; % expm1
-newinternal mfid_m_fabs       ; mfid_m_fabs       := scriptindex "m_fabs"       ; def m_fabs      = runscript mfid_m_fabs      enddef ;
-newinternal mfid_m_fdim       ; mfid_m_fdim       := scriptindex "m_fdim"       ; def m_fdim      = runscript mfid_m_fdim      enddef ;
-newinternal mfid_m_floor      ; mfid_m_floor      := scriptindex "m_floor"      ; def m_floor     = runscript mfid_m_floor     enddef ;
-newinternal mfid_m_fma        ; mfid_m_fma        := scriptindex "m_fma"        ; def m_fma       = runscript mfid_m_fma       enddef ;
-newinternal mfid_m_fmax       ; mfid_m_fmax       := scriptindex "m_fmax"       ; def m_fmax      = runscript mfid_m_fmax      enddef ;
-newinternal mfid_m_fmin       ; mfid_m_fmin       := scriptindex "m_fmin"       ; def m_fmin      = runscript mfid_m_fmin      enddef ;
-newinternal mfid_m_fmod       ; mfid_m_fmod       := scriptindex "m_fmod"       ; def m_fmod      = runscript mfid_m_fmod      enddef ;
-newinternal mfid_m_frexp      ; mfid_m_frexp      := scriptindex "m_frexp"      ; def m_frexp     = runscript mfid_m_frexp     enddef ;
-newinternal mfid_m_gamma      ; mfid_m_gamma      := scriptindex "m_gamma"      ; def m_gamma     = runscript mfid_m_gamma     enddef ;
-newinternal mfid_m_hypot      ; mfid_m_hypot      := scriptindex "m_hypot"      ; def m_hypot     = runscript mfid_m_hypot     enddef ;
-newinternal mfid_m_isfinite   ; mfid_m_isfinite   := scriptindex "m_isfinite"   ; def m_isfinite  = runscript mfid_m_isfinite  enddef ;
-newinternal mfid_m_isinf      ; mfid_m_isinf      := scriptindex "m_isinf"      ; def m_isinf     = runscript mfid_m_isinf     enddef ;
-newinternal mfid_m_isnan      ; mfid_m_isnan      := scriptindex "m_isnan"      ; def m_isnan     = runscript mfid_m_isnan     enddef ;
-newinternal mfid_m_isnormal   ; mfid_m_isnormal   := scriptindex "m_isnormal"   ; def m_isnormal  = runscript mfid_m_isnormal  enddef ;
-newinternal mfid_m_jz         ; mfid_m_jz         := scriptindex "m_j0"         ; def m_jz        = runscript mfid_m_jz        enddef ; % j0
-newinternal mfid_m_j          ; mfid_m_j          := scriptindex "m_j1"         ; def m_j         = runscript mfid_m_j         enddef ; % j1
-newinternal mfid_m_jn         ; mfid_m_jn         := scriptindex "m_jn"         ; def m_jn        = runscript mfid_m_jn        enddef ;
-newinternal mfid_m_ldexp      ; mfid_m_ldexp      := scriptindex "m_ldexp"      ; def m_ldexp     = runscript mfid_m_ldexp     enddef ;
-newinternal mfid_m_lgamma     ; mfid_m_lgamma     := scriptindex "m_lgamma"     ; def m_lgamma    = runscript mfid_m_lgamma    enddef ;
-newinternal mfid_m_log        ; mfid_m_log        := scriptindex "m_log"        ; def m_log       = runscript mfid_m_log       enddef ;
-newinternal mfid_m_logten     ; mfid_m_logte      := scriptindex "m_log10"      ; def m_logten    = runscript mfid_m_logten    enddef ; % log10
-newinternal mfid_m_logp       ; mfid_m_logp       := scriptindex "m_log1p"      ; def m_logp      = runscript mfid_m_logp      enddef ; % log1p
-newinternal mfid_m_logtwo     ; mfid_m_logtwo     := scriptindex "m_log2"       ; def m_logtwo    = runscript mfid_m_logtwo    enddef ; % log2
-newinternal mfid_m_logb       ; mfid_m_logb       := scriptindex "m_logb"       ; def m_logb      = runscript mfid_m_logb      enddef ;
-newinternal mfid_m_modf       ; mfid_m_modf       := scriptindex "m_modf"       ; def m_modf      = runscript mfid_m_modf      enddef ;
-newinternal mfid_m_nearbyint  ; mfid_m_nearbyint  := scriptindex "m_nearbyint"  ; def m_nearbyint = runscript mfid_m_nearbyint enddef ;
-newinternal mfid_m_nextafter  ; mfid_m_nextafter  := scriptindex "m_nextafter"  ; def m_nextafter = runscript mfid_m_nextafter enddef ;
-newinternal mfid_m_pow        ; mfid_m_pow        := scriptindex "m_pow"        ; def m_pow       = runscript mfid_m_pow       enddef ;
-newinternal mfid_m_rad        ; mfid_m_rad        := scriptindex "m_rad"        ; def m_rad       = runscript mfid_m_rad       enddef ;
-newinternal mfid_m_remainder  ; mfid_m_remainder  := scriptindex "m_remainder"  ; def m_remainder = runscript mfid_m_remainder enddef ;
-newinternal mfid_m_remquo     ; mfid_m_remquo     := scriptindex "m_remquo"     ; def m_remquo    = runscript mfid_m_remquo    enddef ;
-newinternal mfid_m_round      ; mfid_m_round      := scriptindex "m_round"      ; def m_round     = runscript mfid_m_round     enddef ;
-newinternal mfid_m_scalbn     ; mfid_m_scalbn     := scriptindex "m_scalbn"     ; def m_scalbn    = runscript mfid_m_scalbn    enddef ;
-newinternal mfid_m_sin        ; mfid_m_sin        := scriptindex "m_sin"        ; def m_sin       = runscript mfid_m_sin       enddef ;
-newinternal mfid_m_sinh       ; mfid_m_sinh       := scriptindex "m_sinh"       ; def m_sinh      = runscript mfid_m_sinh      enddef ;
-newinternal mfid_m_sqrt       ; mfid_m_sqrt       := scriptindex "m_sqrt"       ; def m_sqrt      = runscript mfid_m_sqrt      enddef ;
-newinternal mfid_m_tan        ; mfid_m_tan        := scriptindex "m_tan"        ; def m_tan       = runscript mfid_m_tan       enddef ;
-newinternal mfid_m_tanh       ; mfid_m_tanh       := scriptindex "m_tanh"       ; def m_tanh      = runscript mfid_m_tanh      enddef ;
-newinternal mfid_m_tgamma     ; mfid_m_tgamma     := scriptindex "m_tgamma"     ; def m_tgamma    = runscript mfid_m_tgamma    enddef ;
-newinternal mfid_m_trunc      ; mfid_m_trunc      := scriptindex "m_trunc"      ; def m_trunc     = runscript mfid_m_trunc     enddef ;
-newinternal mfid_m_yz         ; mfid_m_yz         := scriptindex "m_y0"         ; def m_yz        = runscript mfid_m_yz        enddef ; % y0
-newinternal mfid_m_y          ; mfid_m_y          := scriptindex "m_y1"         ; def m_y         = runscript mfid_m_y         enddef ; % y1
-newinternal mfid_m_yn         ; mfid_m_yn         := scriptindex "m_yn"         ; def m_yn        = runscript mfid_m_yn        enddef ;
-
-newinternal mfid_c_sin        ; mfid_c_asin       := scriptindex "c_sin"        ; def c_sin       = runscript mfid_c_sin       enddef ;
-newinternal mfid_c_cos        ; mfid_c_acos       := scriptindex "c_cos"        ; def c_cos       = runscript mfid_c_cos       enddef ;
-newinternal mfid_c_tan        ; mfid_c_acos       := scriptindex "c_tan"        ; def c_tan       = runscript mfid_c_tan       enddef ;
-newinternal mfid_c_sinh       ; mfid_c_acos       := scriptindex "c_sinh"       ; def c_sinh      = runscript mfid_c_sinh      enddef ;
-newinternal mfid_c_cosh       ; mfid_c_acos       := scriptindex "c_cosh"       ; def c_cosh      = runscript mfid_c_cosh      enddef ;
-newinternal mfid_c_tanh       ; mfid_c_acos       := scriptindex "c_tanh"       ; def c_tanh      = runscript mfid_c_tanh      enddef ;
-
-newinternal mfid_c_asin       ; mfid_c_acos       := scriptindex "c_asin"       ; def c_asin      = runscript mfid_c_asin      enddef ;
-newinternal mfid_c_acos       ; mfid_c_acos       := scriptindex "c_acos"       ; def c_acos      = runscript mfid_c_acos      enddef ;
-newinternal mfid_c_atan       ; mfid_c_acos       := scriptindex "c_atan"       ; def c_atan      = runscript mfid_c_atan      enddef ;
-newinternal mfid_c_asinh      ; mfid_c_acos       := scriptindex "c_asinh"      ; def c_asinh     = runscript mfid_c_asinh     enddef ;
-newinternal mfid_c_acosh      ; mfid_c_acos       := scriptindex "c_acosh"      ; def c_acosh     = runscript mfid_c_acosh     enddef ;
-newinternal mfid_c_atanh      ; mfid_c_acos       := scriptindex "c_atanh"      ; def c_atanh     = runscript mfid_c_atanh     enddef ;
-
-newinternal mfid_c_sqrt       ; mfid_c_acos       := scriptindex "c_sqrt"       ; def c_sqrt      = runscript mfid_c_sqrt      enddef ;
-newinternal mfid_c_abs        ; mfid_c_acos       := scriptindex "c_abs"        ; def c_abs       = runscript mfid_c_abs       enddef ;
-newinternal mfid_c_arg        ; mfid_c_acos       := scriptindex "c_arg"        ; def c_arg       = runscript mfid_c_arg       enddef ;
-newinternal mfid_c_conj       ; mfid_c_acos       := scriptindex "c_conj"       ; def c_conj      = runscript mfid_c_conj      enddef ;
-newinternal mfid_c_exp        ; mfid_c_acos       := scriptindex "c_exp"        ; def c_exp       = runscript mfid_c_exp       enddef ;
-newinternal mfid_c_log        ; mfid_c_acos       := scriptindex "c_log"        ; def c_log       = runscript mfid_c_log       enddef ;
-newinternal mfid_c_proj       ; mfid_c_acos       := scriptindex "c_proj"       ; def c_proj      = runscript mfid_c_proj      enddef ;
-
-newinternal mfid_c_erf        ; mfid_c_erf        := scriptindex "c_erf"        ; def c_erf       = runscript mfid_c_erf       enddef ;
-newinternal mfid_c_erfc       ; mfid_c_erfc       := scriptindex "c_erfc"       ; def c_erfc      = runscript mfid_c_erfc      enddef ;
-newinternal mfid_c_erfcx      ; mfid_c_erfcx      := scriptindex "c_erfcx"      ; def c_erfcx     = runscript mfid_c_erfcx     enddef ;
-newinternal mfid_c_erfi       ; mfid_c_erfi       := scriptindex "c_erfi"       ; def c_erfi      = runscript mfid_c_erfi      enddef ;
-
-%           mfid_c_imag       ; mfid_c_acos       := scriptindex "c_imag"       ; def c_imag      = runscript mfid_c_imag      enddef ;
-%           mfid_c_real       ; mfid_c_acos       := scriptindex "c_real"       ; def c_real      = runscript mfid_c_real      enddef ;
-%           mfid_c_neg        ; mfid_c_neg        := scriptindex "c_neg"        ; def c_neg       = runscript mfid_c_neg       enddef ;
-
-newinternal mfid_c_pow        ; mfid_c_pow        := scriptindex "c_pow"        ; def c_pow (expr a,b) = runscript mfid_c_pow a b enddef ;
-%           mfid_c_add        ; mfid_c_add        := scriptindex "c_add"        ; def c_add (expr a,b) = runscript mfid_c_add a b enddef ;
-%           mfid_c_sub        ; mfid_c_sub        := scriptindex "c_sub"        ; def c_sub (expr a,b) = runscript mfid_c_sub a b enddef ;
-newinternal mfid_c_mul        ; mfid_c_mul        := scriptindex "c_mul"        ; def c_mul (expr a,b) = runscript mfid_c_mul a b enddef ;
-newinternal mfid_c_div        ; mfid_c_div        := scriptindex "c_div"        ; def c_div (expr a,b) = runscript mfid_c_div a b enddef ;
-
-newinternal mfid_c_voigt      ; mfid_c_voigt      := scriptindex "c_voigt"      ; def c_voigt     (expr a,b,c) = runscript mfid_c_voigt      a b c enddef ;
-newinternal mfid_c_voigt_hwhm ; mfid_c_voigt_hwhm := scriptindex "c_voigt_hwhm" ; def c_voigt_hwhm(expr a,b)   = runscript mfid_c_voigt_hwhm a b   enddef ;
+newscriptindex mfid_m_acos       ; mfid_m_acos       := scriptindex "m_acos"       ; def m_acos      = runscript mfid_m_acos      enddef ;
+newscriptindex mfid_m_acosh      ; mfid_m_acosh      := scriptindex "m_acosh"      ; def m_acosh     = runscript mfid_m_acosh     enddef ;
+newscriptindex mfid_m_asin       ; mfid_m_asin       := scriptindex "m_asin"       ; def m_asin      = runscript mfid_m_asin      enddef ;
+newscriptindex mfid_m_asinh      ; mfid_m_asinh      := scriptindex "m_asinh"      ; def m_asinh     = runscript mfid_m_asinh     enddef ;
+newscriptindex mfid_m_atan       ; mfid_m_atan       := scriptindex "m_atan"       ; def m_atan      = runscript mfid_m_atan      enddef ;
+newscriptindex mfid_m_atantwo    ; mfid_m_atantwo    := scriptindex "m_atan2"      ; def m_atantwo   = runscript mfid_m_atantwo   enddef ; % atan2
+newscriptindex mfid_m_atanh      ; mfid_m_atanh      := scriptindex "m_atanh"      ; def m_atanh     = runscript mfid_m_atanh     enddef ;
+newscriptindex mfid_m_cbrt       ; mfid_m_cbrt       := scriptindex "m_cbrt"       ; def m_cbrt      = runscript mfid_m_cbrt      enddef ;
+newscriptindex mfid_m_ceil       ; mfid_m_ceil       := scriptindex "m_ceil"       ; def m_ceil      = runscript mfid_m_ceil      enddef ;
+newscriptindex mfid_m_copysign   ; mfid_m_copysign   := scriptindex "m_copysign"   ; def m_copysign  = runscript mfid_m_copysign  enddef ;
+newscriptindex mfid_m_cos        ; mfid_m_cos        := scriptindex "m_cos"        ; def m_cos       = runscript mfid_m_cos       enddef ;
+newscriptindex mfid_m_cosh       ; mfid_m_cosh       := scriptindex "m_cosh"       ; def m_cosh      = runscript mfid_m_cosh      enddef ;
+newscriptindex mfid_m_deg        ; mfid_m_deg        := scriptindex "m_deg"        ; def m_deg       = runscript mfid_m_deg       enddef ;
+newscriptindex mfid_m_erf        ; mfid_m_erf        := scriptindex "m_erf"        ; def m_erf       = runscript mfid_m_erf       enddef ;
+newscriptindex mfid_m_erfc       ; mfid_m_erfc       := scriptindex "m_erfc"       ; def m_erfc      = runscript mfid_m_erfc      enddef ;
+newscriptindex mfid_m_exp        ; mfid_m_exp        := scriptindex "m_exp"        ; def m_exp       = runscript mfid_m_exp       enddef ;
+newscriptindex mfid_m_exptwo     ; mfid_m_exptwo     := scriptindex "m_exp2"       ; def m_exptwo    = runscript mfid_m_exptwo    enddef ; % exp2
+newscriptindex mfid_m_expm       ; mfid_m_expm       := scriptindex "m_expm1"      ; def m_expm      = runscript mfid_m_expm      enddef ; % expm1
+newscriptindex mfid_m_fabs       ; mfid_m_fabs       := scriptindex "m_fabs"       ; def m_fabs      = runscript mfid_m_fabs      enddef ;
+newscriptindex mfid_m_fdim       ; mfid_m_fdim       := scriptindex "m_fdim"       ; def m_fdim      = runscript mfid_m_fdim      enddef ;
+newscriptindex mfid_m_floor      ; mfid_m_floor      := scriptindex "m_floor"      ; def m_floor     = runscript mfid_m_floor     enddef ;
+newscriptindex mfid_m_fma        ; mfid_m_fma        := scriptindex "m_fma"        ; def m_fma       = runscript mfid_m_fma       enddef ;
+newscriptindex mfid_m_fmax       ; mfid_m_fmax       := scriptindex "m_fmax"       ; def m_fmax      = runscript mfid_m_fmax      enddef ;
+newscriptindex mfid_m_fmin       ; mfid_m_fmin       := scriptindex "m_fmin"       ; def m_fmin      = runscript mfid_m_fmin      enddef ;
+newscriptindex mfid_m_fmod       ; mfid_m_fmod       := scriptindex "m_fmod"       ; def m_fmod      = runscript mfid_m_fmod      enddef ;
+newscriptindex mfid_m_frexp      ; mfid_m_frexp      := scriptindex "m_frexp"      ; def m_frexp     = runscript mfid_m_frexp     enddef ;
+newscriptindex mfid_m_gamma      ; mfid_m_gamma      := scriptindex "m_gamma"      ; def m_gamma     = runscript mfid_m_gamma     enddef ;
+newscriptindex mfid_m_hypot      ; mfid_m_hypot      := scriptindex "m_hypot"      ; def m_hypot     = runscript mfid_m_hypot     enddef ;
+newscriptindex mfid_m_isfinite   ; mfid_m_isfinite   := scriptindex "m_isfinite"   ; def m_isfinite  = runscript mfid_m_isfinite  enddef ;
+newscriptindex mfid_m_isinf      ; mfid_m_isinf      := scriptindex "m_isinf"      ; def m_isinf     = runscript mfid_m_isinf     enddef ;
+newscriptindex mfid_m_isnan      ; mfid_m_isnan      := scriptindex "m_isnan"      ; def m_isnan     = runscript mfid_m_isnan     enddef ;
+newscriptindex mfid_m_isnormal   ; mfid_m_isnormal   := scriptindex "m_isnormal"   ; def m_isnormal  = runscript mfid_m_isnormal  enddef ;
+newscriptindex mfid_m_jz         ; mfid_m_jz         := scriptindex "m_j0"         ; def m_jz        = runscript mfid_m_jz        enddef ; % j0
+newscriptindex mfid_m_j          ; mfid_m_j          := scriptindex "m_j1"         ; def m_j         = runscript mfid_m_j         enddef ; % j1
+newscriptindex mfid_m_jn         ; mfid_m_jn         := scriptindex "m_jn"         ; def m_jn        = runscript mfid_m_jn        enddef ;
+newscriptindex mfid_m_ldexp      ; mfid_m_ldexp      := scriptindex "m_ldexp"      ; def m_ldexp     = runscript mfid_m_ldexp     enddef ;
+newscriptindex mfid_m_lgamma     ; mfid_m_lgamma     := scriptindex "m_lgamma"     ; def m_lgamma    = runscript mfid_m_lgamma    enddef ;
+newscriptindex mfid_m_log        ; mfid_m_log        := scriptindex "m_log"        ; def m_log       = runscript mfid_m_log       enddef ;
+newscriptindex mfid_m_logten     ; mfid_m_logten     := scriptindex "m_log10"      ; def m_logten    = runscript mfid_m_logten    enddef ; % log10
+newscriptindex mfid_m_logp       ; mfid_m_logp       := scriptindex "m_log1p"      ; def m_logp      = runscript mfid_m_logp      enddef ; % log1p
+newscriptindex mfid_m_logtwo     ; mfid_m_logtwo     := scriptindex "m_log2"       ; def m_logtwo    = runscript mfid_m_logtwo    enddef ; % log2
+newscriptindex mfid_m_logb       ; mfid_m_logb       := scriptindex "m_logb"       ; def m_logb      = runscript mfid_m_logb      enddef ;
+newscriptindex mfid_m_modf       ; mfid_m_modf       := scriptindex "m_modf"       ; def m_modf      = runscript mfid_m_modf      enddef ;
+newscriptindex mfid_m_nearbyint  ; mfid_m_nearbyint  := scriptindex "m_nearbyint"  ; def m_nearbyint = runscript mfid_m_nearbyint enddef ;
+newscriptindex mfid_m_nextafter  ; mfid_m_nextafter  := scriptindex "m_nextafter"  ; def m_nextafter = runscript mfid_m_nextafter enddef ;
+newscriptindex mfid_m_pow        ; mfid_m_pow        := scriptindex "m_pow"        ; def m_pow       = runscript mfid_m_pow       enddef ;
+newscriptindex mfid_m_rad        ; mfid_m_rad        := scriptindex "m_rad"        ; def m_rad       = runscript mfid_m_rad       enddef ;
+newscriptindex mfid_m_remainder  ; mfid_m_remainder  := scriptindex "m_remainder"  ; def m_remainder = runscript mfid_m_remainder enddef ;
+newscriptindex mfid_m_remquo     ; mfid_m_remquo     := scriptindex "m_remquo"     ; def m_remquo    = runscript mfid_m_remquo    enddef ;
+newscriptindex mfid_m_round      ; mfid_m_round      := scriptindex "m_round"      ; def m_round     = runscript mfid_m_round     enddef ;
+newscriptindex mfid_m_scalbn     ; mfid_m_scalbn     := scriptindex "m_scalbn"     ; def m_scalbn    = runscript mfid_m_scalbn    enddef ;
+newscriptindex mfid_m_sin        ; mfid_m_sin        := scriptindex "m_sin"        ; def m_sin       = runscript mfid_m_sin       enddef ;
+newscriptindex mfid_m_sinh       ; mfid_m_sinh       := scriptindex "m_sinh"       ; def m_sinh      = runscript mfid_m_sinh      enddef ;
+newscriptindex mfid_m_sqrt       ; mfid_m_sqrt       := scriptindex "m_sqrt"       ; def m_sqrt      = runscript mfid_m_sqrt      enddef ;
+newscriptindex mfid_m_tan        ; mfid_m_tan        := scriptindex "m_tan"        ; def m_tan       = runscript mfid_m_tan       enddef ;
+newscriptindex mfid_m_tanh       ; mfid_m_tanh       := scriptindex "m_tanh"       ; def m_tanh      = runscript mfid_m_tanh      enddef ;
+newscriptindex mfid_m_tgamma     ; mfid_m_tgamma     := scriptindex "m_tgamma"     ; def m_tgamma    = runscript mfid_m_tgamma    enddef ;
+newscriptindex mfid_m_trunc      ; mfid_m_trunc      := scriptindex "m_trunc"      ; def m_trunc     = runscript mfid_m_trunc     enddef ;
+newscriptindex mfid_m_yz         ; mfid_m_yz         := scriptindex "m_y0"         ; def m_yz        = runscript mfid_m_yz        enddef ; % y0
+newscriptindex mfid_m_y          ; mfid_m_y          := scriptindex "m_y1"         ; def m_y         = runscript mfid_m_y         enddef ; % y1
+newscriptindex mfid_m_yn         ; mfid_m_yn         := scriptindex "m_yn"         ; def m_yn        = runscript mfid_m_yn        enddef ;
+
+newscriptindex mfid_c_sin        ; mfid_c_asin       := scriptindex "c_sin"        ; def c_sin       = runscript mfid_c_sin       enddef ;
+newscriptindex mfid_c_cos        ; mfid_c_acos       := scriptindex "c_cos"        ; def c_cos       = runscript mfid_c_cos       enddef ;
+newscriptindex mfid_c_tan        ; mfid_c_acos       := scriptindex "c_tan"        ; def c_tan       = runscript mfid_c_tan       enddef ;
+newscriptindex mfid_c_sinh       ; mfid_c_acos       := scriptindex "c_sinh"       ; def c_sinh      = runscript mfid_c_sinh      enddef ;
+newscriptindex mfid_c_cosh       ; mfid_c_acos       := scriptindex "c_cosh"       ; def c_cosh      = runscript mfid_c_cosh      enddef ;
+newscriptindex mfid_c_tanh       ; mfid_c_acos       := scriptindex "c_tanh"       ; def c_tanh      = runscript mfid_c_tanh      enddef ;
+
+newscriptindex mfid_c_asin       ; mfid_c_acos       := scriptindex "c_asin"       ; def c_asin      = runscript mfid_c_asin      enddef ;
+newscriptindex mfid_c_acos       ; mfid_c_acos       := scriptindex "c_acos"       ; def c_acos      = runscript mfid_c_acos      enddef ;
+newscriptindex mfid_c_atan       ; mfid_c_acos       := scriptindex "c_atan"       ; def c_atan      = runscript mfid_c_atan      enddef ;
+newscriptindex mfid_c_asinh      ; mfid_c_acos       := scriptindex "c_asinh"      ; def c_asinh     = runscript mfid_c_asinh     enddef ;
+newscriptindex mfid_c_acosh      ; mfid_c_acos       := scriptindex "c_acosh"      ; def c_acosh     = runscript mfid_c_acosh     enddef ;
+newscriptindex mfid_c_atanh      ; mfid_c_acos       := scriptindex "c_atanh"      ; def c_atanh     = runscript mfid_c_atanh     enddef ;
+
+newscriptindex mfid_c_sqrt       ; mfid_c_acos       := scriptindex "c_sqrt"       ; def c_sqrt      = runscript mfid_c_sqrt      enddef ;
+newscriptindex mfid_c_abs        ; mfid_c_acos       := scriptindex "c_abs"        ; def c_abs       = runscript mfid_c_abs       enddef ;
+newscriptindex mfid_c_arg        ; mfid_c_acos       := scriptindex "c_arg"        ; def c_arg       = runscript mfid_c_arg       enddef ;
+newscriptindex mfid_c_conj       ; mfid_c_acos       := scriptindex "c_conj"       ; def c_conj      = runscript mfid_c_conj      enddef ;
+newscriptindex mfid_c_exp        ; mfid_c_acos       := scriptindex "c_exp"        ; def c_exp       = runscript mfid_c_exp       enddef ;
+newscriptindex mfid_c_log        ; mfid_c_acos       := scriptindex "c_log"        ; def c_log       = runscript mfid_c_log       enddef ;
+newscriptindex mfid_c_proj       ; mfid_c_acos       := scriptindex "c_proj"       ; def c_proj      = runscript mfid_c_proj      enddef ;
+
+newscriptindex mfid_c_erf        ; mfid_c_erf        := scriptindex "c_erf"        ; def c_erf       = runscript mfid_c_erf       enddef ;
+newscriptindex mfid_c_erfc       ; mfid_c_erfc       := scriptindex "c_erfc"       ; def c_erfc      = runscript mfid_c_erfc      enddef ;
+newscriptindex mfid_c_erfcx      ; mfid_c_erfcx      := scriptindex "c_erfcx"      ; def c_erfcx     = runscript mfid_c_erfcx     enddef ;
+newscriptindex mfid_c_erfi       ; mfid_c_erfi       := scriptindex "c_erfi"       ; def c_erfi      = runscript mfid_c_erfi      enddef ;
+
+%              mfid_c_imag       ; mfid_c_acos       := scriptindex "c_imag"       ; def c_imag      = runscript mfid_c_imag      enddef ;
+%              mfid_c_real       ; mfid_c_acos       := scriptindex "c_real"       ; def c_real      = runscript mfid_c_real      enddef ;
+%              mfid_c_neg        ; mfid_c_neg        := scriptindex "c_neg"        ; def c_neg       = runscript mfid_c_neg       enddef ;
+
+newscriptindex mfid_c_pow        ; mfid_c_pow        := scriptindex "c_pow"        ; def c_pow (expr a,b) = runscript mfid_c_pow a b enddef ;
+%              mfid_c_add        ; mfid_c_add        := scriptindex "c_add"        ; def c_add (expr a,b) = runscript mfid_c_add a b enddef ;
+%              mfid_c_sub        ; mfid_c_sub        := scriptindex "c_sub"        ; def c_sub (expr a,b) = runscript mfid_c_sub a b enddef ;
+newscriptindex mfid_c_mul        ; mfid_c_mul        := scriptindex "c_mul"        ; def c_mul (expr a,b) = runscript mfid_c_mul a b enddef ;
+newscriptindex mfid_c_div        ; mfid_c_div        := scriptindex "c_div"        ; def c_div (expr a,b) = runscript mfid_c_div a b enddef ;
+
+newscriptindex mfid_c_voigt      ; mfid_c_voigt      := scriptindex "c_voigt"      ; def c_voigt     (expr a,b,c) = runscript mfid_c_voigt      a b c enddef ;
+newscriptindex mfid_c_voigt_hwhm ; mfid_c_voigt_hwhm := scriptindex "c_voigt_hwhm" ; def c_voigt_hwhm(expr a,b)   = runscript mfid_c_voigt_hwhm a b   enddef ;
 
 vardef c_add (expr a, b) = a + b   enddef ;
 vardef c_sub (expr a, b) = a + b   enddef ;
@@ -146,7 +146,6 @@ if (numbersystem == "scaled") or (numbersystem == "double") :
     vardef invcos primary x = (m_acos(x))/radian enddef ;
     vardef invtan primary x = (m_atan(x))/radian enddef ;
 
-
   % vardef sind primary x = angle(m_sin x) enddef ;
   % vardef cosd primary x = angle(m_cos x) enddef ;
   % vardef tand primary x = angle(m_tan x) enddef ;
@@ -158,4 +157,27 @@ if (numbersystem == "scaled") or (numbersystem == "double") :
   % vardef tand primary x = sind(x)/cosd(x)  enddef ;
   % vardef cotd primary x = cosd(x)/sind(x)  enddef ;
 
+    permanent sin, cos, tan, sinh, cosh, tanh, asin, acos, atan, asinh, acosh, atanh, invsin, invcos, invtan, asind, acosd, atand ;
+
 fi ;
+
+permanent
+    m_acos, m_acosh, m_asin, m_asinh, m_atan, m_atantwo, m_atanh, m_cbrt, m_ceil,
+    m_copysign, m_cos, m_cosh, m_deg, m_erf, m_erfc, m_exp, m_exptwo, m_expm, m_fabs,
+    m_fdim, m_floor, m_fma, m_fmax, m_fmin, m_fmod, m_frexp, m_gamma, m_hypot,
+    m_isfinite, m_isinf, m_isnan, m_isnormal, m_jz, m_j, m_jn, m_ldexp, m_lgamma,
+    m_log, m_logten, m_logp, m_logtwo, m_logb, m_modf, m_nearbyint, m_nextafter,
+    m_pow, m_rad, m_remainder, m_remquo, m_round, m_scalbn, m_sin, m_sinh, m_sqrt,
+    m_tan, m_tanh, m_tgamma, m_trunc, m_yz, m_y, m_yn,
+
+    c_sin, c_cos, c_tan, c_sinh, c_cosh, c_tanh, c_asin, c_acos, c_atan, c_asinh,
+    c_acosh, c_atanh, c_sqrt, c_abs, c_arg, c_conj, c_exp, c_log, c_proj, c_erf,
+    c_erfc, c_erfcx, c_erfi, c_imag, c_real, c_neg, c_pow, c_add, c_sub, c_mul,
+    c_div, c_voigt, c_voigt_hwhm, c_add, c_sub, c_imag, c_real, c_neg,
+
+    % sqrt, sind, cosd, % these are primitives
+
+    sqr, log, ln, exp, inv, sin, cos, tan, asin, acos, atan, invsin, invcos, invtan,
+    tand, asind, acosd, atand, tand, cotd
+;
+
diff --git a/metapost/context/base/mpxl/mp-mlib.mpxl b/metapost/context/base/mpxl/mp-mlib.mpxl
index 3c32256d3..dc5bad4d7 100644
--- a/metapost/context/base/mpxl/mp-mlib.mpxl
+++ b/metapost/context/base/mpxl/mp-mlib.mpxl
@@ -11,10 +11,9 @@
 %C therefore copyrighted by \PRAGMA. See licen-en.pdf for
 %C details.
 
-if unknown mplib        : endinput ; fi ;
-if known   context_mlib : endinput ; fi ;
+if known context_mlib : endinput ; fi ;
 
-boolean context_mlib ; context_mlib := true ;
+boolean context_mlib ; context_mlib := true ; immutable context_mlib ;
 
 % numeric LUATEXFUNCTIONALITY ; LUATEXFUNCTIONALITY := runscript("mp.print(LUATEXFUNCTIONALITY or (status and status.development_id) or 6346)") ;
 
@@ -29,6 +28,8 @@ vardef isobject expr p =
     fi
 enddef ;
 
+permanent isobject ;
+
 %D Color and transparency
 %D
 %D Separable:
@@ -53,6 +54,11 @@ newinternal saturationtransparent ; saturationtransparent := 14 ;
 newinternal colortransparent      ; colortransparent      := 15 ;
 newinternal luminositytransparent ; luminositytransparent := 16 ;
 
+permanent normaltransparent, multiplytransparent, screentransparent, overlaytransparent,
+    softlighttransparent, hardlighttransparent, colordodgetransparent, colorburntransparent,
+    darkentransparent, lightentransparent, differencetransparent, exclusiontransparent,
+    huetransparent, saturationtransparent, colortransparent, luminositytransparent ;
+
 vardef transparency_alternative_to_number(expr name) =
     if string name :
         if expandafter known scantokens(name & "transparent") :
@@ -153,10 +159,14 @@ def cmyk(expr c, m, y, k) =
     (c,m,y,k)
 enddef ;
 
+permanent spotcolor, multitonecolor, transparent, withtransparency, namedcolor, withopacity, cmyk ;
+
 % Texts (todo: better strut ratio, now .7 hardcoded, should be passed)
 
 newinternal textextoffset ; textextoffset := 0 ;
 
+permanent textextoffset ;
+
 %%%%%%% mfun_tt_w[], mfun_tt_h[], mfun_tt_d[] ; % we can consider using colors (less hash space)
 color   mfun_tt_b ;
 numeric mfun_tt_n ; mfun_tt_n := 0 ;
@@ -217,9 +227,13 @@ newinternal txtcatcoderegime ; txtcatcoderegime := runscript("return catcodes.nu
 
 newinternal catcoderegime    ; catcoderegime    := ctxcatcoderegime ;
 
-newinternal mfid_sometextext ; mfid_sometextext := scriptindex "sometextext" ;
-newinternal mfid_madetextext ; mfid_madetextext := scriptindex "madetextext" ;
+immutable inicatcoderegime, texcatcoderegime, luacatcoderegime, notcatcoderegime,
+    vrbcatcoderegime, prtcatcoderegime, ctxcatcoderegime, txtcatcoderegime ;
 
+permanent catcoderegime ;
+
+newscriptindex mfid_sometextext ; mfid_sometextext := scriptindex "sometextext" ;
+newscriptindex mfid_madetextext ; mfid_madetextext := scriptindex "madetextext" ;
 
 vardef rawtextext(expr s) =
     if s = "" :
@@ -228,7 +242,7 @@ vardef rawtextext(expr s) =
         mfun_tt_n := mfun_tt_n + 1 ;
         mfun_tt_c := nullpicture ;
         mfun_tt_o := nullpicture ;
-        addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
+        addto mfun_tt_o doublepath origin base_draw_options ;
         mfun_tt_r := runscript mfid_sometextext mfun_tt_n s catcoderegime ;
         addto mfun_tt_c doublepath unitsquare
             xscaled wdpart mfun_tt_r
@@ -246,7 +260,7 @@ 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
+    addto mfun_tt_o doublepath origin base_draw_options ;
     mfun_tt_r := runscript mfid_madetextext mfun_tt_n ;
     addto mfun_tt_c doublepath unitsquare
         xscaled wdpart mfun_tt_r
@@ -303,6 +317,8 @@ vardef fontsize expr name =
     fi
 enddef ;
 
+permanent fontsize ;
+
 pair mfun_laboff        ; mfun_laboff        := origin   ;
 pair mfun_laboff.lft    ; mfun_laboff.lft    := (-1,0)   ;
 pair mfun_laboff.rt     ; mfun_laboff.rt     := (1,0)    ;
@@ -409,53 +425,32 @@ enddef ;
 
 % we save the plain variant
 
-vardef plain_thelabel@#(expr p,z) =
-    if string p :
-        plain_thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
-    else :
-        p shifted (z + labeloffset*laboff@# - mfun_labshift@#(p))
-    fi
-enddef;
-
-def plain_label = % takes two arguments, contrary to textext that takes one
-    normaldraw plain_thelabel
-enddef ;
-
-let mfun_label    = label ;
-let mfun_thelabel = thelabel ;
-
-def useplainlabels = % somehow let doesn't work for all code
-    def label    = plain_label    enddef ;
-    def thelabel = plain_thelabel enddef ;
-enddef ;
-
-def usemetafunlabels =
-    let label    = mfun_label ;
-    let thelabel = mfun_thelabel ;
-enddef ;
-
-vardef dotlabel@#(expr s,z) text t_ =
-    label@#(s,z) t_ ;
-    interim linecap := rounded ;
-    normaldraw z withpen pencircle scaled dotlabeldiam t_ ;
-enddef ;
-
-plain_compatibility_data := plain_compatibility_data & "save label, thelabel ;" & "useplainlabels ;" ;
-
-% vardef thetextext@#(expr p,z) =
-%   % interim labeloffset := textextoffset ;
+% vardef plain_thelabel@#(expr p,z) =
 %     if string p :
-%         thetextext@#(rawtextext(p),z)
-%     elseif numeric p :
-%         thetextext@#(rawtextext(decimal p),z)
+%         plain_thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
 %     else :
-%         p
-%             if (mfun_labtype@# >= 10) :
-%                 shifted (0,ypart center p)
-%             fi
-%             shifted (z + textextoffset*mfun_laboff@# - mfun_labshift@#(p))
+%         p shifted (z + labeloffset*laboff@# - mfun_labshift@#(p))
 %     fi
+% enddef;
+%
+% def plain_label = % takes two arguments, contrary to textext that takes one
+%     normaldraw plain_thelabel
 % enddef ;
+%
+% let mfun_label    = label ;
+% let mfun_thelabel = thelabel ;
+%
+% def useplainlabels = % somehow let doesn't work for all code
+%     def label    = plain_label    enddef ;
+%     def thelabel = plain_thelabel enddef ;
+% enddef ;
+%
+% def usemetafunlabels =
+%     let label    = mfun_label ;
+%     let thelabel = mfun_thelabel ;
+% enddef ;
+%
+% plain_compatibility_data := plain_compatibility_data & "save label, thelabel ;" & "useplainlabels ;" ;
 
 newinternal anchortextexts ; anchortextexts := 0 ; % disabled by default
 
@@ -489,6 +484,8 @@ vardef onetimetextext@#(expr p) = % no draw here
     thetextext@#(p,origin)
 enddef ;
 
+permanent rawtextext, rawmadetext, validtexbox, rawtexbox, thetextext, textext, onetimetextext ;
+
 % formatted text
 
 pair mfun_tt_z ;
@@ -497,7 +494,7 @@ vardef rawfmttext(text t) =
     mfun_tt_n := mfun_tt_n + 1 ;
     mfun_tt_c := nullpicture ;
     mfun_tt_o := nullpicture ;
-    addto mfun_tt_o doublepath origin _op_ ; % save drawoptions
+    addto mfun_tt_o doublepath origin base_draw_options ;
     mfun_tt_r := lua.mp.mf_formatted_text(mfun_tt_n,t) ;
     addto mfun_tt_c doublepath unitsquare
         xscaled wdpart mfun_tt_r
@@ -553,6 +550,8 @@ vardef texbox@#(expr category, name) = % no draw here
     thetexbox@#(category,name,origin)
 enddef ;
 
+permanent rawfmttext, thefmttext, fmttext, onetimefmttext, thetexbox, texbox ;
+
 % vardef thelabel@#(expr p,z) =
 %     if string p :
 %         thelabel@#(rawtextext("\definedfont[" & defaultfont & "]" & p) scaled defaultscale,z)
@@ -609,6 +608,8 @@ primarydef s infont name = % nasty hack
     fi
 enddef ;
 
+permanent theoffset, thelabel, anchored ;
+
 % Helper
 
 string mfun_prescript_separator ; mfun_prescript_separator := char(13) ;
@@ -621,6 +622,8 @@ newinternal shadefactor  ; shadefactor  := 1 ;      % currently obsolete
 pair        shadeoffset  ; shadeoffset  := origin ; % currently obsolete
 boolean     trace_shades ; trace_shades := false ;  % still there
 
+permanent shadefactor, shadeoffset ;
+
 % def withlinearshading (expr a, b) =
 %     withprescript "sh_type=linear"
 %     withprescript "sh_domain=0 1"
@@ -855,6 +858,7 @@ def shaded text s =
     s
 enddef ;
 
+
 % For me.
 
 primarydef p shownshadevector v =
@@ -891,6 +895,11 @@ primarydef p shownshadeorigin v =
     )
 enddef ;
 
+permanent withshademethod, withshaderadius, withshadeorigin, withshadevector, withshadedirection,
+    withshadetransform, withshadedomain, withshadefactor, withshadecenter, withshadefraction, withshadestep,
+    withshadecolors, shadedinto, withshade, shaded, shadedup, shadeddown, shadedleft, shadedright,
+    shownshadevector, shownshadedirection, shownshadecenter, shownshadeorigin ;
+
 % Old macros:
 
 def withcircularshade (expr a, b, ra, rb, ca, cb) =
@@ -917,6 +926,8 @@ def withlinearshade (expr a, b, ca, cb) =
     withprescript "sh_center_b=" & ddecimal b % (b shifted shadeoffset)
 enddef ;
 
+permanent withcircularshade, withlinearshade ;
+
 % replaced (obsolete):
 
 def set_linear_vector (suffix a,b)(expr p,n) =
@@ -1047,6 +1058,8 @@ def onlayer primary name =
     withprescript "la_name=" & name
 enddef ;
 
+permanent onlayer ;
+
 % Figures
 
 % def externalfigure primary filename =
@@ -1081,6 +1094,8 @@ def figure primary filename =
     rawtextext("\externalfigure[" & filename & "]")
 enddef ;
 
+permanent withmask, externalfigure, figure ;
+
 % Positions
 
 def register (expr tag, width, height, offset) =
@@ -1090,6 +1105,8 @@ def register (expr tag, width, height, offset) =
 %     ) ; % no transformations
 enddef ;
 
+permanent register ;
+
 % outlines (todo: pass around less arguments)
 
 numeric currentoutlinetext ; currentoutlinetext := 0 ;
@@ -1213,14 +1230,14 @@ def mfun_do_outline_options_d = enddef ;
 def mfun_do_outline_options_f = enddef ;
 def mfun_do_outline_options_r = enddef ;
 
-def outlinetexttopath(text o, p, n) =
+def outlinetexttopath (text o, p, n) =
     scantokens("numeric " & str n &   ";") ;
     scantokens("path "    & str p & "[];") ;
     n := 0 ;
     for i within o : p[incr(n)] := pathpart i ; endfor ;
 enddef ;
 
-def filloutlinetext(expr o) =
+def filloutlinetext (expr o) =
     draw image (
         save n, m ; numeric n, m ; n := m := 0 ;
         for i within o :
@@ -1237,7 +1254,7 @@ def filloutlinetext(expr o) =
     )
 enddef ;
 
-def drawoutlinetext(expr o) =
+def drawoutlinetext (expr o) =
     draw image (
         % nicer for properties
         for i within o :
@@ -1275,6 +1292,9 @@ vardef outlinetext@# (expr t) text rest =
     ) mfun_do_outline_options_r ; )
 enddef ;
 
+
+permanent outlinetexttopath, filloutlinetext, drawoutlinetext, outlinetext ;
+
 % A few helpers:
 
 numeric mfun_c_b_llx, mfun_c_b_h, mfun_c_b_w, mfun_c_b_l ;
@@ -1302,6 +1322,8 @@ vardef rule(expr wd,ht,dp) =
     image (fill (0,-dp)--(wd,-dp)--(wd,ht)--(0,ht)--cycle)
 enddef ;
 
+permanent checkedbounds, checkbounds, strut, rule ;
+
 % Housekeeping
 
 extra_beginfig := extra_beginfig & "currentgraphictext := 0 ; " ;
@@ -1315,6 +1337,8 @@ vardef verbatim(expr s) =
     ditto & "\detokenize{" & s & "}" & ditto
 enddef ;
 
+permanent verbatim ;
+
 % New
 
 def bitmapimage(expr xresolution, yresolution, data) =
@@ -1326,12 +1350,14 @@ def bitmapimage(expr xresolution, yresolution, data) =
     )
 enddef ;
 
+permanent bitmapimage ;
+
 % Experimental:
 %
 % property p ; p = properties(withcolor (1,1,0,0)) ;
 % fill fullcircle scaled 20cm withproperties p ;
 
-let property = picture ;
+let property = picture ; permanent property ;
 
 vardef properties(text t) =
     image(draw unitcircle t)
@@ -1353,25 +1379,29 @@ def withproperties expr p =
     withpostscript postscriptpart p
 enddef ;
 
+permanent properties, withproperties ;
+
 % Experimental:
 
 primarydef t asgroup s = % s = isolated|knockout
     begingroup
-    save grouppicture, wrappedpicture, groupbounds ;
-    picture grouppicture, wrappedpicture ; path groupbounds ;
-    grouppicture := if picture t : t else : image(draw t) fi ;
-    groupbounds := boundingbox grouppicture ;
-    wrappedpicture:= nullpicture ;
-    addto wrappedpicture contour groupbounds
+    save temp_p, temp_q, temp_r ;
+    picture temp_p, temp_q ; path temp_r ;
+    temp_p := if picture t : t else : image(draw t) fi ;
+    temp_r := boundingbox temp_p ;
+    temp_q:= nullpicture ;
+    addto temp_q contour temp_r
         withprescript "gr_state=start"
         withprescript "gr_type=" & s ;
-    addto wrappedpicture also grouppicture ;
-    addto wrappedpicture contour groupbounds
+    addto temp_q also temp_p ;
+    addto temp_q contour temp_r
         withprescript "gr_state=stop" ;
-    wrappedpicture
+    temp_q
     endgroup
 enddef ;
 
+permanent asgroup ;
+
 % Also experimental ... needs to be made better ... so it can change!
 
 string mfun_auto_align[] ;
@@ -1518,6 +1548,8 @@ enddef ;
 string dq ; dq := char 92 & char 34 ;
 string sq ; sq := char 92 & char 39 ;
 
+permanent dq, sq ;
+
 vardef quote     primary s = sq & tostring(s) & sq enddef;
 vardef quotation primary s = dq & tostring(s) & dq enddef;
 
@@ -1533,6 +1565,8 @@ vardef mfun_tagged_string(expr value) =
     fi
 enddef ;
 
+permanent tostring, topair, quote, quotation ;
+
 % A more flexible variant for passing data to context. We used to construct strings
 % but running lua is fast enough so we can gain on string construction in metapost
 % which is also not that efficient.
@@ -1635,6 +1669,8 @@ def stoppassingvariable =
     runscript("metapost.popvariable()") ;
 enddef ;
 
+permanent passvariable, passarrayvariable, startpassingvariable, stoppassingvariable ;
+
 % moved here from mp-grap.mpiv
 
 % vardef escaped_format(expr s) =
@@ -1698,6 +1734,8 @@ vardef varfmt(expr f, x) = "\MPformatted{"   & escaped_format(f) & "}{" & mfun_t
 vardef format@#   (expr f, x) = textext@#(strfmt(f, x)) enddef ;
 vardef formatted@#(expr f, x) = textext@#(varfmt(f, x)) enddef ;
 
+permanent format, formatted ;
+
 % could be this (something to discuss with alan as it involves graph):
 %
 % vardef format   (expr f,x) = lua.mp.graphformat(f,mfun_tagged_string(x) enddef ;
@@ -1718,18 +1756,15 @@ 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 ;
+def eoclip   text t = clip t withpostscript "evenodd" enddef ;
+
+permanent fillup, eofillup, eofill, nofill, nodraw, dodraw, dofill, eoclip ;
 
 % maybe (saves a bogus path but the problem is that it can influence the dimensions):
 
 % def dodraw text t = draw center currentpicture         withpostscript "flush" enddef ;
 % def dofill text t = fill center currentpicture --cycle withpostscript "flush" enddef ;
 
-if contextlmtxmode :
-    def eoclip text t = clip t withpostscript "evenodd" enddef ;
-else :
-    def eoclip text t = clip t enddef ; % no postscripts yet
-fi ;
-
 % def withrule expr r =
 %     if (t = "even-odd") or (t = "evenodd") : withpostscript "evenodd" fi
 % enddef ;
@@ -1737,6 +1772,13 @@ fi ;
 % A comment will end up on top of the graphic in the output. This can be handy for
 % locating a graphic: comment("test graphic").
 
+% This can be a prescript to currentpicture ... we can actually make
+%
+% setprescript  str to picture/path ;
+% setpostscript str to picture/path ;
+
+def special text t = enddef ;
+
 def comment expr str =
     special "metapost.comment[[" & str & "]]" ;
 enddef ;
@@ -1745,8 +1787,12 @@ vardef report(text t) =
     lua.mp.report(t)
 enddef ;
 
+permanent comment, report ;
+
 % This overloads a dummy:
 
+% todo: use mfid_* cum suis
+
 vardef uniquelist(suffix list) =
     % this can be optimized by passing all values at once and returning
     % a result but for now this is ok .. we need an undef foo
@@ -1773,3 +1819,5 @@ vardef uniquelist(suffix list) =
     endfor ;
     lua.mp.disposehash(h) ;
 enddef ;
+
+permanent uniquelist ;
diff --git a/metapost/context/base/mpxl/mp-node.mpxl b/metapost/context/base/mpxl/mp-node.mpxl
new file mode 100644
index 000000000..ce3f888b5
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-node.mpxl
@@ -0,0 +1,275 @@
+%D \module
+%D   [       file=mp-node.mpiv,
+%D        version=1998.02.15,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=Node Based Graphics,
+%D         author=Alan Braslau,
+%D           date=\currentdate,
+%D      copyright={Alan Braslau & \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D The crossing macros were written as part of this module but as they
+%D can be of use elsewhere they are defined in mp-tool.
+
+if known context_node : endinput ; fi ;
+
+boolean context_node ; context_node := true ; immutable context_node ;
+
+% Build a path from the node positions.
+% Must be integer and continuous in index starting at 0.
+
+vardef makenodepath(suffix p) =
+    if unknown p :
+        if not path p :
+            d := dimension p ;
+            if d>0 :
+                scantokens("path " & prefix p & for i=1 upto d : "[]" & endfor " ;") ;
+            else :
+                path p ;
+            fi
+        fi
+        save i ; i = -1 ;
+        p = forever : exitif unknown p.pos[incr i] ;
+                 p.pos[i] --
+             endfor cycle ;
+    fi
+enddef ;
+
+% can take a list:
+
+def clearpath text t =
+    save t ; path t ;
+enddef ;
+
+def clearnodepath = clearpath nodepath enddef ;
+
+clearnodepath ;
+
+% the trailing "," below handles when number of t<3
+
+vardef makenode@#(text t) =
+    for a = t :
+        if (path a) or (unknown a) :
+            mfun_makenode@#(t,)
+        elseif (string a) and (length(a) = 0) :
+            mfun_makenode@#(t,)
+        else :
+            mfun_makenode@#(nodepath, t,)
+        fi
+        exitif true ;
+    endfor
+enddef ;
+
+vardef node@#(text t) =
+    for a = t :
+        if (path a) or (unknown a) :
+            mfun_node@#(t,)
+        elseif (string a) and (length(a) = 0) :
+            mfun_node@#(t,)
+        else :
+            mfun_node@#(nodepath, t,)
+        fi
+        exitif true ;
+    endfor
+enddef ;
+
+vardef nodeboundingpoint@#(text t) =
+    for a = t :
+        if (path a) or (unknown a) :
+            mfun_nodeboundingpoint@#(t)
+        elseif (string a) and (length(a) = 0) :
+            mfun_nodeboundingpoint@#(t)
+        else :
+            mfun_nodeboundingpoint@#(nodepath,a)
+        fi
+        exitif true ;
+    endfor
+enddef ;
+
+vardef fromto@#(expr d, f)(text t) =
+    fromtopaths@#(d,nodepath,f,nodepath,t)
+enddef ;
+
+% returns a pair suffix if the path is unknown
+
+vardef mfun_makenode@#(suffix p)(expr i)(text t) =
+    save d, b ; string b ;
+    d = dimension p ;
+    if d > 0 :
+        b := prefix p ;
+        if not picture p.pic[i] : scantokens("picture " & b &
+                                      for j=1 upto d : "[]" & endfor
+                                      "pic[] ;") ; fi
+        if not pair    p.pos[i] : scantokens("pair "    & b &
+                                      for j=1 upto d : "[]" & endfor
+                                      "pos[] ;") ; fi
+    else :
+        if not picture p.pic[i] : picture p.pic[] ; fi
+        if not pair    p.pos[i] : pair    p.pos[] ; fi
+    fi
+    for a = t :
+        if known p.pic[i] :
+            addto p.pic[i] also
+        else :
+            p.pic[i] =
+        fi
+            if     picture a           : a
+            elseif string  a           : if (length(a) > 0) : textext@#(a) else : nullpicture fi
+            elseif numeric a           : textext@#(decimal a)
+            elseif ((boolean a) and a) : image(draw origin withpen currentpen scaled 4)
+            else                       : nullpicture
+            fi ;
+    endfor
+    p.pos[i] if known p : := point i of p ; fi
+enddef ;
+
+% returns a picture
+
+vardef mfun_node@#(suffix p)(expr i)(text t) =
+    if pair mfun_makenode@#(p,i,t) :
+        % nop: enclose in "if ... fi" to gobble the function return.
+    fi
+    if (unknown p) and (known p.pos[i]) :
+        makenodepath(p) ;
+    fi
+    if known p.pic[i] :
+        p.pic[i] if known p : shifted point i of p fi
+    else :
+        nullpicture
+    fi
+enddef ;
+
+newinternal node_loopback_yscale ; node_loopback_yscale := 1 ;
+
+% returns a path
+
+vardef fromtopaths@#(expr d)(suffix p)(expr f)(suffix q)(text s) =
+    save r, t, l ;
+    path r[] ; picture l ;
+    for a = s :
+        if unknown t :
+            t = a ;
+            if (unknown p) and (known p.pos[f]) :
+                makenodepath(p) ;
+            fi
+            if (unknown q) and (known q.pos[t]) :
+                makenodepath(q) ;
+            fi
+            r0 = if ((not numeric d) and
+                     (point f of p = point f of q) and
+                     (point t of p = point t of q)) :
+                     subpath (f,t) of p
+                 else :
+                     point f of p -- point t of q
+                 fi ;
+            save deviation ;
+            deviation := if numeric d: d else: 0 fi ;
+            r1 = if (point 0 of r0) = (point length r0 of r0) :
+                     (fullcircle yscaled node_loopback_yscale rotated 180
+                         if mfun_laboff@# <> origin :
+                             rotated angle mfun_laboff@#
+                             shifted     .5mfun_laboff@#
+                         fi)
+                         scaled deviation
+                         shifted point 0 of r0
+                 elseif deviation=0 :
+                     r0
+                 else :
+                     point 0 of r0 ..
+                     unitvector direction .5length r0 of r0 rotated 90
+                         scaled deviation * arclength r0
+                         shifted point .5length r0 of r0 ..
+                     point length r0 of r0
+                fi ;
+        else :
+            if known l :
+                addto l also
+            else :
+                l :=
+            fi
+                if     picture a           : a
+                elseif string  a           : if (length(a) > 0) : textext@#(a) else : nullpicture fi
+                elseif numeric a           : textext@#(decimal a)
+                elseif ((boolean a) and a) : image(draw origin withpen currentpen scaled 4)
+                else                       : nullpicture
+                fi ;
+        fi
+    endfor
+    r2 = r1
+        if known p.pic[f if cycle p: mod length p fi] :
+            cutbefore boundingbox (p.pic[f if cycle p: mod length p fi] shifted point f of p)
+        fi
+        if known q.pic[t if cycle q: mod length q fi] :
+            cutafter  boundingbox (q.pic[t if cycle q: mod length q fi] shifted point t of q)
+        fi
+        ;
+    if known l :
+        l := l shifted point .5length r2 of r2 ;
+        draw l ;
+        (r2 if str @# = "" : crossingunder l fi)
+    else :
+        r2
+    fi
+enddef ;
+
+% returns pair: bounding point of the node picture
+
+vardef mfun_nodeboundingpoint@#(suffix p)(expr i) =
+    if known p.pic[i] :
+        boundingpoint@#(p.pic[i])
+    else :
+        origin
+    fi
+enddef ;
+
+% returns pair: scaled laboff direction
+
+vardef relative@#(expr s) =
+    (mfun_laboff@# scaled s)
+enddef ;
+
+% returns pair: vector between nodes (+ optional scale)
+
+vardef betweennodes@#(suffix p)(expr f)(suffix q)(text s) =
+    save t ;
+    for a = s :
+        if unknown t :
+            t = a ;
+            mfun_nodeboundingpoint@#(q,t) + mfun_nodeboundingpoint@#(p,f)
+        else :
+            + relative@#(a)
+        fi
+    endfor
+enddef ;
+
+% helpers that save passing tokens
+
+def mfun_node_init(expr dx, dy, da) =
+     save nodelattice ; pair nodelattice[] ;
+     nodelattice0 = (dx,0) ;
+     nodelattice1 = dy * dir(da) ;
+     clearnodepath ;
+     save nodecount ; nodecount = -1;
+enddef ;
+
+def mfun_node_make(expr x, y, s) =
+    nodecount := nodecount + 1 ;
+    makenode(nodecount,s) = x * nodelattice0 + y * nodelattice1 ;
+enddef ;
+
+def mfun_node_flush =
+    for i=0 upto nodecount:
+        draw node(i) ;
+    endfor
+enddef ;
+
+vardef mfun_nodes_fromto@#(expr d, f)(text t) =
+    fromtopaths@#(d,nodepath,f,nodepath,t)
+enddef ;
+
+permanent makenodepath, clearpath, clearnodepath, makenode, node, nodeboundingpoint, fromto, fromtopaths, relative, betweennodes ;
+permanent node_loopback_yscale ;
+
diff --git a/metapost/context/base/mpxl/mp-page.mpxl b/metapost/context/base/mpxl/mp-page.mpxl
index 8a4b735e0..bb9d8e893 100644
--- a/metapost/context/base/mpxl/mp-page.mpxl
+++ b/metapost/context/base/mpxl/mp-page.mpxl
@@ -16,11 +16,13 @@
 
 if known context_page : endinput ; fi ;
 
-boolean context_page ; context_page := true ;
+boolean context_page ; context_page := true ; immutable context_page ;
 
 def LoadPageState = enddef ; % just in case some old style uses it
 
-% Next we implement the the page area model. First some constants.
+% Next we implement the the page area model. First some constants. We use a
+% matrix approach as we do at the TeX end but we could have gone for a period
+% separated variant. Too late.
 
 LeftEdge             :=  -4 ; Top             := -40 ;
 LeftEdgeSeparator    :=  -3 ; TopSeparator    := -30 ;
@@ -35,101 +37,132 @@ RightEdge            :=  +4 ; Bottom          := +40 ;
 numeric HorPos ; HorPos := 0 ;
 numeric VerPos ; VerPos := 0 ;
 
+immutable % permanent
+    Text, HorPos, VerPos,
+    LeftEdge, LeftEdgeSeparator, LeftMargin, LeftMarginSeparator,
+    RightMarginSeparator, RightMargin, RightEdgeSeparator, RightEdge,
+    Top, TopSeparator, Header, HeaderSeparator,
+    FooterSeparator, Footer, BottomSeparator, Bottom ;
+
 % Because metapost > 1.50 has dynamic memory management and is less efficient than
 % before we now delay calculations ... (on a document with 150 pages the time spent
 % in mp was close to 5 seconds which was only due to initialising the page related
 % areas, something that was hardly noticeable before. At least now we're back to
 % half a second for such a case.
 
-def SetPageVsize =
-    numeric Vsize[] ;
-    Vsize[Top]             = TopHeight ;
-    Vsize[TopSeparator]    = TopDistance ;
-    Vsize[Header]          = HeaderHeight ;
-    Vsize[HeaderSeparator] = HeaderDistance ;
-    Vsize[Text]            = TextHeight ;
-    Vsize[FooterSeparator] = FooterDistance ;
-    Vsize[Footer]          = FooterHeight ;
-    Vsize[BottomSeparator] = BottomDistance ;
-    Vsize[Bottom]          = BottomHeight ;
-enddef ;
-
-def SetPageHsize =
-    numeric Hsize[] ;
-    Hsize[LeftEdge]             = LeftEdgeWidth ;
-    Hsize[LeftEdgeSeparator]    = LeftEdgeDistance ;
-    Hsize[LeftMargin]           = LeftMarginWidth ;
-    Hsize[LeftMarginSeparator]  = LeftMarginDistance ;
-    Hsize[Text]                 = MakeupWidth ;
-    Hsize[RightMarginSeparator] = RightMarginDistance ;
-    Hsize[RightMargin]          = RightMarginWidth ;
-    Hsize[RightEdgeSeparator]   = RightEdgeDistance ;
-    Hsize[RightEdge]            = RightEdgeWidth ;
-enddef ;
-
-def SetPageVstep =
-    numeric Vstep[] ;
-    Vstep[Top]             = Vstep[TopSeparator]   +Vsize[TopSeparator] ;
-    Vstep[TopSeparator]    = PaperHeight-TopSpace ;
-    Vstep[Header]          = Vstep[TopSeparator]   -Vsize[Header] ;
-    Vstep[HeaderSeparator] = Vstep[Header]         -Vsize[HeaderSeparator] ;
-    Vstep[Text]            = Vstep[HeaderSeparator]-Vsize[Text] ;
-    Vstep[FooterSeparator] = Vstep[Text]           -Vsize[FooterSeparator] ;
-    Vstep[Footer]          = Vstep[FooterSeparator]-Vsize[Footer] ;
-    Vstep[BottomSeparator] = Vstep[Footer]         -Vsize[BottomSeparator] ;
-    Vstep[Bottom]          = Vstep[BottomSeparator]-Vsize[Bottom] ;
-enddef ;
-
-def SetPageHstep =
-    numeric Hstep[] ;
-    Hstep[LeftEdge]             = Hstep[LeftEdgeSeparator]   -Hsize[LeftEdge] ;
-    Hstep[LeftEdgeSeparator]    = Hstep[LeftMargin]          -Hsize[LeftEdgeSeparator] ;
-    Hstep[LeftMargin]           = Hstep[LeftMarginSeparator] -Hsize[LeftMargin] ;
-    Hstep[LeftMarginSeparator]  = Hstep[Text]                -Hsize[LeftMarginSeparator] ;
-    Hstep[Text]                 = BackSpace ;
-    Hstep[RightMarginSeparator] = Hstep[Text]                +Hsize[Text] ;
-    Hstep[RightMargin]          = Hstep[RightMarginSeparator]+Hsize[RightMarginSeparator] ;
-    Hstep[RightEdgeSeparator]   = Hstep[RightMargin]         +Hsize[RightMargin] ;
-    Hstep[RightEdge]            = Hstep[RightEdgeSeparator]  +Hsize[RightEdgeSeparator] ;
-enddef ;
-
-def SetPageArea =
-    path Area[][] ;
+% We could go for just setting them (:=):
+
+path    mfun_page_area[][] ;
+pair    mfun_page_location[][] ;
+path    mfun_page_field[][] ;
+numeric mfun_page_vsize[] ;
+numeric mfun_page_hsize[] ;
+numeric mfun_page_vstep[] ;
+numeric mfun_page_hstep[] ;
+
+newinternal mfun_page_done ; mfun_page_done := 0 ;
+
+def mfun_page_check_vsize =
+    mfun_page_vsize[Top]             := TopHeight ;
+    mfun_page_vsize[TopSeparator]    := TopDistance ;
+    mfun_page_vsize[Header]          := HeaderHeight ;
+    mfun_page_vsize[HeaderSeparator] := HeaderDistance ;
+    mfun_page_vsize[Text]            := TextHeight ;
+    mfun_page_vsize[FooterSeparator] := FooterDistance ;
+    mfun_page_vsize[Footer]          := FooterHeight ;
+    mfun_page_vsize[BottomSeparator] := BottomDistance ;
+    mfun_page_vsize[Bottom]          := BottomHeight ;
+enddef ;
+
+def mfun_page_check_hsize =
+    mfun_page_hsize[LeftEdge]             := LeftEdgeWidth ;
+    mfun_page_hsize[LeftEdgeSeparator]    := LeftEdgeDistance ;
+    mfun_page_hsize[LeftMargin]           := LeftMarginWidth ;
+    mfun_page_hsize[LeftMarginSeparator]  := LeftMarginDistance ;
+    mfun_page_hsize[Text]                 := MakeupWidth ;
+    mfun_page_hsize[RightMarginSeparator] := RightMarginDistance ;
+    mfun_page_hsize[RightMargin]          := RightMarginWidth ;
+    mfun_page_hsize[RightEdgeSeparator]   := RightEdgeDistance ;
+    mfun_page_hsize[RightEdge]            := RightEdgeWidth ;
+enddef ;
+
+def mfun_page_check_vstep =
+    mfun_page_vstep[TopSeparator]    := PaperHeight-TopSpace ;
+    mfun_page_vstep[Top]             := mfun_page_vstep[TopSeparator]   +mfun_page_vsize[TopSeparator] ;
+    mfun_page_vstep[Header]          := mfun_page_vstep[TopSeparator]   -mfun_page_vsize[Header] ;
+    mfun_page_vstep[HeaderSeparator] := mfun_page_vstep[Header]         -mfun_page_vsize[HeaderSeparator] ;
+    mfun_page_vstep[Text]            := mfun_page_vstep[HeaderSeparator]-mfun_page_vsize[Text] ;
+    mfun_page_vstep[FooterSeparator] := mfun_page_vstep[Text]           -mfun_page_vsize[FooterSeparator] ;
+    mfun_page_vstep[Footer]          := mfun_page_vstep[FooterSeparator]-mfun_page_vsize[Footer] ;
+    mfun_page_vstep[BottomSeparator] := mfun_page_vstep[Footer]         -mfun_page_vsize[BottomSeparator] ;
+    mfun_page_vstep[Bottom]          := mfun_page_vstep[BottomSeparator]-mfun_page_vsize[Bottom] ;
+enddef ;
+
+def mfun_page_check_hstep =
+    mfun_page_hstep[Text]                 := BackSpace ;
+    mfun_page_hstep[LeftMarginSeparator]  := mfun_page_hstep[Text]                -mfun_page_hsize[LeftMarginSeparator] ;
+    mfun_page_hstep[RightMarginSeparator] := mfun_page_hstep[Text]                +mfun_page_hsize[Text] ;
+    mfun_page_hstep[LeftMargin]           := mfun_page_hstep[LeftMarginSeparator] -mfun_page_hsize[LeftMargin] ;
+    mfun_page_hstep[RightMargin]          := mfun_page_hstep[RightMarginSeparator]+mfun_page_hsize[RightMarginSeparator] ;
+    mfun_page_hstep[LeftEdgeSeparator]    := mfun_page_hstep[LeftMargin]          -mfun_page_hsize[LeftEdgeSeparator] ;
+    mfun_page_hstep[LeftEdge]             := mfun_page_hstep[LeftEdgeSeparator]   -mfun_page_hsize[LeftEdge] ;
+    mfun_page_hstep[RightEdgeSeparator]   := mfun_page_hstep[RightMargin]         +mfun_page_hsize[RightMargin] ;
+    mfun_page_hstep[RightEdge]            := mfun_page_hstep[RightEdgeSeparator]  +mfun_page_hsize[RightEdgeSeparator] ;
+enddef ;
+
+def mfun_check_page_dimensions =
+    if mfun_page_done <> RealPageNumber :
+        if LayoutHasChanged :
+            mfun_page_check_vsize ;
+            mfun_page_check_hsize ;
+            mfun_page_check_vstep ;
+            mfun_page_check_hstep ;
+        fi ;
+        mfun_page_done := RealPageNumber ;
+    fi ;
+enddef;
+
+
+def mfun_check_page_area =
+    mfun_check_page_dimensions ;
     for VerPos=Top step 10 until Bottom:
         for HorPos=LeftEdge step 1 until RightEdge:
-            Area[HorPos][VerPos] := unitsquare xscaled Hsize[HorPos] yscaled Vsize[VerPos] ;
-            Area[VerPos][HorPos] := Area[HorPos][VerPos] ;
+            mfun_page_area[HorPos][VerPos] := unitsquare xscaled mfun_page_hsize[HorPos] yscaled mfun_page_vsize[VerPos] ;
+            mfun_page_area[VerPos][HorPos] := mfun_page_area[HorPos][VerPos] ;
         endfor ;
     endfor ;
 enddef ;
 
-def SetPageLocation =
-    pair Location[][] ;
+def mfun_check_page_location =
+    mfun_check_page_dimensions ;
     for VerPos=Top step 10 until Bottom:
         for HorPos=LeftEdge step 1 until RightEdge:
-            Location[HorPos][VerPos] := (Hstep[HorPos],Vstep[VerPos]) ;
-            Location[VerPos][HorPos] := Location[HorPos][VerPos] ;
+            mfun_page_location[HorPos][VerPos] := (mfun_page_hstep[HorPos],mfun_page_vstep[VerPos]) ;
+            mfun_page_location[VerPos][HorPos] := mfun_page_location[HorPos][VerPos] ;
         endfor ;
     endfor ;
 enddef ;
 
-def SetPageField =
-    path Field[][] ;
+def mfun_check_page_field =
+    mfun_check_page_dimensions ;
     for VerPos=Top step 10 until Bottom:
         for HorPos=LeftEdge step 1 until RightEdge:
-            Field[HorPos][VerPos] := unitsquare xscaled Hsize[HorPos] yscaled Vsize[VerPos] shifted (Hstep[HorPos],Vstep[VerPos]) ;
-            Field[VerPos][HorPos] := Field[HorPos][VerPos] ;
+            mfun_page_field[HorPos][VerPos] := unitsquare xscaled mfun_page_hsize[HorPos] yscaled mfun_page_vsize[VerPos] shifted (mfun_page_hstep[HorPos],mfun_page_vstep[VerPos]) ;
+            mfun_page_field[VerPos][HorPos] := mfun_page_field[HorPos][VerPos] ;
         endfor ;
     endfor ;
 enddef ;
 
-def Area     = hide(SetPageArea     ;) Area     enddef ;
-def Location = hide(SetPageLocation ;) Location enddef ;
-def Field    = hide(SetPageField    ;) Field    enddef ;
-def Vsize    = hide(SetPageVsize    ;) Vsize    enddef ;
-def Hsize    = hide(SetPageHsize    ;) Hsize    enddef ;
-def Vstep    = hide(SetPageVstep    ;) Vstep    enddef ;
-def Hstep    = hide(SetPageHstep    ;) Hstep    enddef ;
+def Area     = hide(mfun_check_page_area       ;) mfun_page_area     enddef ;
+def Location = hide(mfun_check_page_location   ;) mfun_page_location enddef ;
+def Field    = hide(mfun_check_page_field      ;) mfun_page_field    enddef ;
+def Vsize    = hide(mfun_check_page_dimensions ;) mfun_page_vsize    enddef ;
+def Hsize    = hide(mfun_check_page_dimensions ;) mfun_page_hsize    enddef ;
+def Vstep    = hide(mfun_check_page_dimensions ;) mfun_page_vstep    enddef ;
+def Hstep    = hide(mfun_check_page_dimensions ;) mfun_page_hstep    enddef ;
+
+immutable % permanent
+    Area, Location, Field, Vsize, Hsize, Vstep, Hstep ;
 
 vardef FrontPageWidth  = PaperWidth enddef ;
 vardef BackPageWidth   = PaperWidth enddef ;
@@ -140,17 +173,19 @@ vardef FrontPageHeight = PaperHeight enddef ;
 vardef BackPageHeight  = PaperHeight enddef ;
 vardef SpineHeight     = PaperHeight enddef ;
 
-def SetPagePage      = path Page      ; Page      := unitsquare xscaled PaperWidth      yscaled PaperHeight ; enddef ;
-def SetPageCoverPage = path CoverPage ; CoverPage := unitsquare xscaled CoverWidth      yscaled CoverHeight ; enddef ;
-def SetPageSpine     = path Spine     ; Spine     := unitsquare xscaled SpineWidth      yscaled CoverHeight shifted (BackPageWidth,0) ; enddef ;
-def SetPageBackPage  = path BackPage  ; BackPage  := unitsquare xscaled BackPageWidth   yscaled CoverHeight ; enddef ;
-def SetPageFrontPage = path FrontPage ; FrontPage := unitsquare xscaled FrontPageWidth  yscaled CoverHeight shifted (BackPageWidth+SpineWidth,0) ; enddef ;
+path mfun_page_page, mfun_page_cover, mfun_page_spine, mfun_page_back, mfun_page_front ;
 
-def Page      = hide(SetPagePage     ;) Page      enddef ;
-def CoverPage = hide(SetPageCoverPage;) CoverPage enddef ;
-def Spine     = hide(SetPageSpine    ;) Spine     enddef ;
-def BackPage  = hide(SetPageBackPage ;) BackPage  enddef ;
-def FrontPage = hide(SetPageFrontPage;) FrontPage enddef ;
+def mfun_check_page  = mfun_page_page  := unitsquare xscaled PaperWidth     yscaled PaperHeight ; enddef ;
+def mfun_check_cover = mfun_page_cover := unitsquare xscaled CoverWidth     yscaled CoverHeight ; enddef ;
+def mfun_check_spine = mfun_page_spine := unitsquare xscaled SpineWidth     yscaled CoverHeight shifted (BackPageWidth,0) ; enddef ;
+def mfun_check_back  = mfun_page_back  := unitsquare xscaled BackPageWidth  yscaled CoverHeight ; enddef ;
+def mfun_check_front = mfun_page_front := unitsquare xscaled FrontPageWidth yscaled CoverHeight shifted (BackPageWidth+SpineWidth,0) ; enddef ;
+
+def Page      = hide(mfun_check_page  ;) mfun_page_page  enddef ;
+def CoverPage = hide(mfun_check_cover ;) mfun_page_cover enddef ;
+def Spine     = hide(mfun_check_spine ;) mfun_page_spine enddef ;
+def BackPage  = hide(mfun_check_back  ;) mfun_page_back  enddef ;
+def FrontPage = hide(mfun_check_front ;) mfun_page_front enddef ;
 
 % pages
 
@@ -176,12 +211,20 @@ def StopCover =
     endgroup ;
 enddef ;
 
+immutable % permanent
+    FrontPageWidth, BackPageWidth, CoverWidth, FrontPageHeight, BackPageHeight, CoverHeight,
+    SpineHeight, Page, CoverPage, Spine, BackPage, FrontPage,
+    StartPage, StopPage, StartCover, StopCover ;
+
 % overlays:
 
 def OverlayBox =
     (unitsquare xyscaled (OverlayWidth,OverlayHeight))
 enddef ;
 
+immutable % permanent
+    OverlayBox ;
+
 % handy
 
 def innerenlarged =
@@ -192,6 +235,9 @@ def outerenlarged =
     if OnRightPage : rightenlarged else : leftenlarged  fi
 enddef ;
 
+permanent
+    innerenlarged, outerenlarged ;
+
 % obsolete
 
 % def llEnlarged (expr p,d) = (llcorner p shifted (-d,-d)) enddef ;
@@ -221,7 +267,7 @@ numeric RuleV         ; RuleV         := 0 ;
 numeric RuleThickness ; RuleThickness := 0 ;
 numeric RuleFactor    ; RuleFactor    := 0 ;
 numeric RuleOffset    ; RuleOffset    := 0 ;
-                    def RuleColor      = (.5white) enddef ;
+                    def RuleColor      = (.5white) enddef ; % yet undecided, might become a string
 
 def FakeWord(expr RuleWidth, RuleHeight, RuleDepth, RuleThickness) (text RuleColor) =
     fill unitsquare
@@ -241,3 +287,10 @@ def FakeRule(expr RuleWidth, RuleHeight, RuleDepth, RuleThickness) (text RuleCol
         yscaled RuleHeight
         withcolor RuleColor ;
 enddef ;
+
+mutable
+    RuleDirection, RuleOption, RuleWidth, RuleHeight, RuleDepth, RuleH, RuleV, RuleThickness,
+    RuleFactor, RuleOffset, RuleColor;
+
+permanent
+    FakeWord, FakeRule ;
diff --git a/metapost/context/base/mpxl/mp-shap.mpxl b/metapost/context/base/mpxl/mp-shap.mpxl
new file mode 100644
index 000000000..c4e2a7bf0
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-shap.mpxl
@@ -0,0 +1,228 @@
+%D \module
+%D   [       file=mp-shap.mpiv,
+%D        version=2000.05.31,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=shapes,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+if known context_shap : endinput ; fi ;
+
+boolean context_shap ; context_shap := true ; immutable context_shap ;
+
+path predefined_shapes[] ;
+
+def start_predefined_shape_definition =
+
+    begingroup ;
+
+    save xradius, yradius, xxradius, yyradius ;
+    save ll, lr, ur, ul, llx, lly, lrx, lry, urx, ury, ulx, uly, llxx, llyy, lrxx, lryy, urxx, uryy, ulxx, ulyy, lc, rc, tc, bc ;
+
+    numeric xradius, yradius, xxradius, yyradius ;
+    pair ll, lr, ur, ul, llx, lly, lrx, lry, urx, ury, ulx, uly, llxx, llyy, lrxx, lryy, urxx, uryy, ulxx, ulyy, lc, rc, tc, bc ;
+
+    xradius  := .15 ;
+    yradius  := .15 ;
+    xxradius := .10 ;
+    yyradius := .10 ;
+
+    ll       := llcorner (unitsquare shifted (-.5,-.5)) ;
+    lr       := lrcorner (unitsquare shifted (-.5,-.5)) ;
+    ur       := urcorner (unitsquare shifted (-.5,-.5)) ;
+    ul       := ulcorner (unitsquare shifted (-.5,-.5)) ;
+
+    llx      := ll shifted (xradius,0)  ;
+    lly      := ll shifted (0,yradius)  ;
+
+    lrx      := lr shifted (-xradius,0) ;
+    lry      := lr shifted (0,yradius)  ;
+
+    urx      := ur shifted (-xradius,0) ;
+    ury      := ur shifted (0,-yradius) ;
+
+    ulx      := ul shifted (xradius,0)  ;
+    uly      := ul shifted (0,-yradius) ;
+
+    llxx     := ll shifted (xxradius,0)  ;
+    llyy     := ll shifted (0,yyradius)  ;
+
+    lrxx     := lr shifted (-xxradius,0) ;
+    lryy     := lr shifted (0,yyradius)  ;
+
+    urxx     := ur shifted (-xxradius,0) ;
+    uryy     := ur shifted (0,-yyradius) ;
+
+    ulxx     := ul shifted (xxradius,0)  ;
+    ulyy     := ul shifted (0,-yyradius) ;
+
+    lc       := ll shifted (0,.5) ;
+    rc       := lr shifted (0,.5) ;
+    tc       := ul shifted (.5,0) ;
+    bc       := ll shifted (.5,0) ;
+
+enddef ;
+
+def stop_predefined_shape_definition =
+
+    endgroup ;
+
+enddef ;
+
+% this can be delayed
+
+start_predefined_shape_definition ;
+
+    predefined_shapes[ 0] := (origin--cycle) ;
+    predefined_shapes[ 5] := (llx--lrx{right}...rc...{left}urx--ulx{left}...lc...{right}cycle) ;
+    predefined_shapes[ 6] := (ll--lrx{right}...rc...{left}urx--ul--cycle) ;
+    predefined_shapes[ 7] := (ll--lrx{right}...rc...{left}urx--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[ 8] := (lr--ury{up}...tc...{down}uly--ll--cycle) ;
+    predefined_shapes[ 9] := (lr--ury{up}...tc...{down}uly--ll--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[10] := (ll--lr--ur--ul--ll--ur--ul--ll--cycle) ;
+    predefined_shapes[11] := (ll--lr--ur--ul--ll--lr--ul--ll--cycle) ;
+    predefined_shapes[12] := (ll--lrx--ur--ulx--cycle) ;
+    predefined_shapes[13] := (llx--lr--urx--ul--cycle) ;
+    predefined_shapes[14] := (lly--bc--lry--ury--tc--uly--cycle) ;
+    predefined_shapes[15] := (llx--lrx--rc--urx--ulx--lc--cycle) ;
+    predefined_shapes[16] := (ll--lrx--rc--urx--ul--cycle) ;
+    predefined_shapes[17] := (ll--lrx--rc--urx--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[18] := (lr--ury--tc--uly--ll--cycle) ;
+    predefined_shapes[19] := (lr--ury--tc--uly--ll--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[20] := (ll--lr--ur--ul--ll--llxx--ulxx--ul--ll--lr--ur--urxx--lrxx--cycle) ;
+    predefined_shapes[21] := (ul--ll--lr--ur--ul--ulyy--uryy--ur--ul--ll--lr--lryy--llyy--cycle) ;
+    predefined_shapes[22] := (ll--lrx--lry--ur--ulx--uly--cycle) ;
+    predefined_shapes[23] := (llx--lr--ury--urx--ul--lly--cycle) ;
+    predefined_shapes[24] := (ll--lr--ur--ul--cycle) ;
+    predefined_shapes[25] := (llx--lrx--lry--ury--urx--ulx--uly--lly--cycle) ;
+    predefined_shapes[26] := (ll--lrx--lry--ur--ul--cycle) ;
+    predefined_shapes[27] := (ll--lr--ury--urx--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[28] := (ll--lr--ury--urx--ul--cycle) ;
+    predefined_shapes[29] := (ll--lrx--lry--ur--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[30] := (bc{right}...{up}rc...tc{left}...{down}lc...{right}bc & bc--tc & tc{left}..{down}lc & lc--rc & rc{up}..tc{left}...{down}lc...{right}bc & cycle) rotated 45;
+    predefined_shapes[31] := (bc{right}...{up}rc...tc{left}...{down}lc...{right}bc & bc--tc & tc{left}..{down}lc & lc--rc & rc{up}..tc{left}...{down}lc...{right}bc & cycle) ;
+    predefined_shapes[32] := (ll{right}...{right}lry--ur--ul--ll--cycle) ;
+    predefined_shapes[33] := (ll{right}...{right}lry--ur--ul--ll--cycle--ul--ulx--ulx shifted(0,yyradius)--ur shifted(yyradius,yyradius)--lry shifted(yyradius,yyradius)--lry shifted(0,yyradius)--ur--ul--cycle ) ;
+    predefined_shapes[34] := (uly..tc..ury & ury..tc shifted (0,-2yradius)..uly & uly--lly & lly..bc..lry & lry--ury & ury..tc shifted (0,-2yradius)..uly & cycle ) ;
+    predefined_shapes[35] := (bc{right}...rc{up}...tc{left}...lc{down}...cycle) ;
+    predefined_shapes[36] := (ul--tc{right}..rc{down}..{left}bc--ll & ll..(xpart llx, ypart lc)..ul & cycle) ;
+    predefined_shapes[37] := (ul--tc{right}..rc{down}..{left}bc--ll & ll..(xpart llx, ypart lc)..ul & cycle) rotatedaround(origin,180) ;
+    predefined_shapes[38] := (ll--lc{up}..tc{right}..{down}rc--lr & lr..(xpart bc, ypart lly)..ll & cycle) ;
+    predefined_shapes[39] := (ll--lc{up}..tc{right}..{down}rc--lr & lr..(xpart bc, ypart lly)..ll & cycle) rotatedaround(origin,180) ;
+    predefined_shapes[40] := (ll--lr--ur--ul--ll--ur--ul--ll--lr--ul--ll--cycle) ;
+    predefined_shapes[41] := (ll--lr--ur--ul--ll--lr--rc--lc--ll--bc--tc--ul--ll & cycle) ;
+    predefined_shapes[42] := (ll--lr--origin shifted (+epsilon,0)--ur--ul--origin shifted (-epsilon,0)--cycle) ;
+    predefined_shapes[43] := (ll--ul--origin shifted (0,+epsilon)--ur--lr--origin shifted (0,-epsilon)--cycle) ;
+    predefined_shapes[45] := (bc--rc--tc--lc--cycle) ;
+    predefined_shapes[46] := (ll--ul--rc--cycle) ;
+    predefined_shapes[47] := (ll--ul--rc--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[48] := (ul--ur--bc--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[49] := (ul--ur--bc--cycle) ;
+    predefined_shapes[56] := (ll--lry--ury--ul--cycle) ;
+    predefined_shapes[57] := (ll--lry--ury--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[58] := (ll--ulx--urx--lr--cycle) ;
+    predefined_shapes[59] := (ll--ulx--urx--lr--cycle) rotatedaround(origin,180);
+    predefined_shapes[66] := (rc--origin shifted ( epsilon,0) --cycle & rc--origin--cycle ) ;
+    predefined_shapes[67] := (lc--origin shifted (-epsilon,0) --cycle & lc--origin--cycle ) ;
+    predefined_shapes[68] := (tc--origin shifted (0, epsilon) --cycle & tc--origin--cycle ) ;
+    predefined_shapes[69] := (bc--origin shifted (0,-epsilon) --cycle & bc--origin--cycle ) ;
+    predefined_shapes[75] := (lly--lry--ury--uly--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[76] := (ll--lr--ur--uly--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[77] := (ll--lr--ury--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[78] := (lly--lr--ur--ul--cycle) rotatedaround(origin,180) ;
+    predefined_shapes[79] := (ll--lry--ur--ul--cycle) rotatedaround(origin,180) ;
+
+    numeric predefined_shapes_xradius  ; predefined_shapes_xradius  := xradius  ;
+    numeric predefined_shapes_yradius  ; predefined_shapes_yradius  := yradius  ;
+    numeric predefined_shapes_xxradius ; predefined_shapes_xxradius := xxradius ;
+    numeric predefined_shapes_yyradius ; predefined_shapes_yyradius := yyradius ;
+
+stop_predefined_shape_definition ;
+
+vardef some_shape_path (expr type) =
+    if known predefined_shapes[type] : predefined_shapes[type] else : predefined_shapes[24] fi
+enddef ;
+
+def some_shape (expr shape_type, shape_width, shape_height, shape_linewidth, shape_linecolor, shape_fillcolor) =
+    begingroup ;
+        save p ; path p ;
+        p := some_shape_path (shape_type) xscaled shape_width yscaled shape_height ;
+        pickup pencircle scaled shape_linewidth ;
+        fill p withcolor shape_fillcolor ;
+        draw p withcolor shape_linecolor ;
+    endgroup ;
+enddef ;
+
+% maybe:
+%
+%     if t>1 : % normal shape
+%         path pp ; pp := some_shape_path(t) xyscaled(bbwidth(p), bbheight(p)) ;
+%         pp := pp shifted - center pp shifted center p ;
+%         fill pp withcolor fc ;
+%         draw pp withpen pencircle scaled lw withcolor lc ;
+
+vardef drawpredefinedshape (expr t, p, lw, lc, fc) =
+    save pp ;
+    if t > 1 : % normal shape
+        path pp ;
+        pp := some_shape_path(t) xyscaled(bbwidth(p), bbheight(p)) shifted center p ;
+        fill pp withcolor fc ;
+        draw pp withpen pencircle scaled lw withcolor lc ;
+    elseif t = 1 : % background only
+        path pp ;
+        pp := fullsquare xyscaled(bbwidth(p), bbheight(p)) shifted center p ;
+        fill pp withcolor fc ;
+    else : % dimensions only
+        picture pp ; pp := nullpicture ;
+        setbounds pp to fullsquare xyscaled(bbwidth(p), bbheight(p)) shifted center p ;
+        draw pp ;
+    fi ;
+enddef ;
+
+vardef drawpredefinedline (expr t, p, lw, lc) =
+    if (t>0) and (length(p)>1) :
+        saveoptions ;
+        drawoptions(withpen pencircle scaled lw withcolor lc) ;
+        draw p ;
+        if     t =  1 :
+            draw arrowheadonpath(p,1) ;
+        elseif t =  2 :
+            draw arrowheadonpath(reverse p,1) ;
+        elseif t =  3 :
+            for $ = p,reverse p :
+                draw arrowheadonpath($,1) ;
+            endfor ;
+        elseif t = 11 :
+            draw arrowheadonpath(p,1/2) ;
+        elseif t = 12 :
+            draw arrowheadonpath(reverse p,1/2) ;
+        elseif t = 13 :
+            for $=p,reverse p :
+                draw arrowheadonpath($,1) ;
+            endfor ;
+            for $=p,reverse p :
+                draw arrowheadonpath($,3/4) ;
+            endfor ;
+        elseif t = 21 :
+            for $=1/5,1/2,4/5 :
+                draw arrowheadonpath(p,$) ;
+            endfor ;
+        elseif t = 22 :
+            for $=1/5,1/2,4/5 :
+                draw arrowheadonpath(reverse p,$) ;
+            endfor ;
+        elseif t = 23 :
+            for $=p,reverse p :
+                draw arrowheadonpath($,1/4) ;
+            endfor ;
+        fi ;
+    fi ;
+enddef ;
+
+let drawshape = drawpredefinedshape ;
+let drawline  = drawpredefinedline  ;
diff --git a/metapost/context/base/mpxl/mp-tool.mpxl b/metapost/context/base/mpxl/mp-tool.mpxl
new file mode 100644
index 000000000..44cad274d
--- /dev/null
+++ b/metapost/context/base/mpxl/mp-tool.mpxl
@@ -0,0 +1,3825 @@
+%D \module
+%D   [       file=mp-tool.mpiv,
+%D        version=1998.02.15,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=auxiliary macros,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+if known context_tool : endinput ; fi ;
+
+boolean context_tool ; context_tool := true ; immutable context_tool ;
+
+let @## = @# ;
+
+let noexpand = quote ;
+
+permanent @##, noexpand ;
+
+%D New, version number testing:
+%D
+%D \starttyping
+%D fill fullcircle scaled 2cm withcolor if mpversiongt("0.6") : red  else : green fi ;
+%D fill fullcircle scaled 1cm withcolor if mpversionlt(0.6)   : blue else : white fi ;
+%D \stoptyping
+
+if not known mpversion : string mpversion ; mpversion := "0.641" ; fi ;
+
+% newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
+
+newinternal metapostversion ; metapostversion := 2.0 ; permanent metapostversion ;
+
+%D We always want \EPS\ conforming output, so we say:
+
+warningcheck := 0 ;
+
+%D Handy:
+
+def nothing = enddef ;
+
+%D Namespace handling:
+
+% let exclamationmark = ! ;
+% let questionmark    = ? ;
+%
+% def unprotect =
+%   let ! = relax ;
+%   let ? = relax ;
+% enddef ;
+%
+% def protect =
+%   let ! = exclamationmark ;
+%   let ? = questionmark ;
+% enddef ;
+%
+% unprotect ;
+%
+% mp!some!module = 10 ; show mp!some!module ; show somemodule ;
+%
+% protect ;
+
+string space   ; space   := char 32 ;
+string percent ; percent := char 37 ;
+string crlf    ; crlf    := char 10 & char 13 ;
+string dquote  ; dquote  := char 34 ;
+
+% let SPACE   = space ;
+% let CRLF    = crlf ;
+% let DQUOTE  = dquote ;
+% let PERCENT = percent ;
+
+permanent space, percent, crlf, dquote ;
+
+% %D Plain compatibility:
+%
+% string plain_compatibility_data ; plain_compatibility_data := "" ;
+%
+% def startplaincompatibility =
+%     begingroup ;
+%     scantokens plain_compatibility_data ;
+% enddef ;
+%
+% def stopplaincompatibility =
+%     endgroup ;
+% enddef ;
+
+%D More neutral:
+
+let triplet    = rgbcolor ;
+let quadruplet = cmykcolor ;
+
+permanent triplet, quadruplet ;
+
+%D Image redefined, for Alan:
+
+vardef image@#(text t) =
+    save currentpicture ;
+    picture currentpicture ;
+    currentpicture := nullpicture ;
+    t ;
+    currentpicture
+    if str @# <> "" :
+        shifted (
+              mfun_labxf@#               * lrcorner p
+         +                 mfun_labyf@#  * ulcorner p
+         + (1-mfun_labxf@#-mfun_labyf@#) * llcorner p
+        )
+    fi
+enddef ;
+
+permanent image ;
+
+%D Variables
+
+def dispose suffix s =
+    if known s :
+        begingroup ;
+            save ss ;
+            if     numeric   s : numeric   ss
+            elseif boolean   s : boolean   ss
+            elseif pair      s : pair      ss
+            elseif path      s : path      ss
+            elseif picture   s : picture   ss
+            elseif string    s : string    ss
+            elseif transform s : transform ss
+            elseif color     s : color     ss
+            elseif rgbcolor  s : rgbcolor  ss
+            elseif cmykcolor s : cmykcolor ss
+            elseif pen       s : pen       ss
+            else             s : numeric   ss
+            fi ;
+            s := ss ;
+        endgroup ;
+    fi ;
+enddef ;
+
+permanent dispose ;
+
+%D Colors:
+
+newinternal nocolormodel   ; nocolormodel   := 1 ;
+newinternal greycolormodel ; greycolormodel := 3 ;
+newinternal graycolormodel ; graycolormodel := 3 ;
+newinternal rgbcolormodel  ; rgbcolormodel  := 5 ;
+newinternal cmykcolormodel ; cmykcolormodel := 7 ;
+
+let grayscale = graycolor ;
+let greyscale = greycolor ;
+
+vardef colorpart expr c =
+    if not picture c :
+        0
+    elseif colormodel c = greycolormodel :
+        greypart c
+    elseif colormodel c = rgbcolormodel  :
+        (redpart c,greenpart c,bluepart c)
+    elseif colormodel c = cmykcolormodel :
+        (cyanpart c,magentapart c,yellowpart c,blackpart c)
+    else :
+        0 % black
+    fi
+enddef ;
+
+vardef colorlike(text c) text v = % colorlike(a) b, c, d ;
+    save temp_p ; picture temp_p ;
+    forsuffixes i=v :
+        temp_p := image(draw origin withcolor c ;) ; % intercept pre and postscripts
+        if (colormodel temp_p = cmykcolormodel) :
+            cmykcolor i ;
+        elseif (colormodel temp_p = rgbcolormodel) :
+            rgbcolor i ;
+        else :
+            greycolor i ;
+        fi ;
+    endfor ;
+enddef ;
+
+permanent nocolormodel, greycolormodel, graycolormodel, rgbcolormodel, cmykcolormodel,
+    greyscale, grayscale, colorpart, colorlike ;
+
+%D Also multiple d's: handy (when we flush colors):
+
+vardef ddecimal primary p =
+    decimal xpart p & " " & decimal ypart p
+enddef ;
+
+vardef dddecimal primary c =
+    decimal redpart c & " " & decimal greenpart c & " " & decimal bluepart c
+enddef ;
+
+vardef ddddecimal primary c =
+    decimal cyanpart c & " " & decimal magentapart c & " " & decimal yellowpart c & " " & decimal blackpart c
+enddef ;
+
+vardef colordecimals primary c =
+    if cmykcolor c  :
+        decimal cyanpart c & ":" & decimal magentapart c & ":" & decimal yellowpart c & ":" & decimal blackpart c
+    elseif rgbcolor c :
+        decimal redpart c & ":" & decimal greenpart c & ":" & decimal bluepart c
+    elseif string c:
+        colordecimals resolvedcolor(c)
+    else :
+        decimal c
+    fi
+enddef ;
+
+vardef colordecimalslist(text t) =
+    save b ; boolean b ; b := false ;
+    for s=t :
+        if b : & " " & fi
+        colordecimals(s)
+        hide(b := true ;)
+    endfor
+enddef ;
+
+permanent decimal, ddecimal, dddecimal, ddddecimal, colordecimals, colordecimalslist ;
+
+% vardef _ctx_color_spec_ primary c =
+%     if cmykcolor c  :
+%          "c=" & decimal cyanpart    c &
+%         ",m=" & decimal magentapart c &
+%         ",y=" & decimal yellowpart  c &
+%         ",k=" & decimal blackpart   c
+%     elseif rgbcolor c :
+%          "r=" & decimal redpart   c &
+%         ",g=" & decimal greenpart c &
+%         ",b=" & decimal bluepart  c
+%     else :
+%          "s=" & decimal c
+%     fi
+% enddef ;
+%
+% vardef _ctx_color_spec_list_(text t) =
+%     save b ; boolean b ; b := false ;
+%     for s=t :
+%         if b : & " " & fi
+%         _ctx_color_spec_(s)
+%         hide(b := true ;)
+%     endfor
+% enddef ;
+
+%D We have standardized data file names:
+
+def job_name =
+    jobname
+enddef ;
+
+%D Because \METAPOST\ has a hard coded limit of 4~datafiles,
+%D we need some trickery when we have multiple files. This will
+%D be redone (via \LUA).
+
+boolean savingdata     ; savingdata     := false ;
+boolean savingdatadone ; savingdatadone := false ;
+
+def savedata expr txt =
+    lua.mp.mf_save_data(txt);
+enddef ;
+
+def startsavingdata =
+    lua.mp.mf_start_saving_data();
+enddef ;
+
+def stopsavingdata =
+    lua.mp.mf_stop_saving_data() ;
+enddef ;
+
+def finishsavingdata =
+    lua.mp.mf_finish_saving_data() ;
+enddef ;
+
+%D Instead of a keystroke eating save and allocation
+%D sequence, you can use the \citeer {new} alternatives to
+%D save and allocate in one command.
+
+%D These might go away!
+
+% def newcolor     text v = forsuffixes i=v : save i ; color     i ; endfor ; enddef ;
+% def newnumeric   text v = forsuffixes i=v : save i ; numeric   i ; endfor ; enddef ;
+% def newboolean   text v = forsuffixes i=v : save i ; boolean   i ; endfor ; enddef ;
+% def newtransform text v = forsuffixes i=v : save i ; transform i ; endfor ; enddef ;
+% def newpath      text v = forsuffixes i=v : save i ; path      i ; endfor ; enddef ;
+% def newpicture   text v = forsuffixes i=v : save i ; picture   i ; endfor ; enddef ;
+% def newstring    text v = forsuffixes i=v : save i ; string    i ; endfor ; enddef ;
+% def newpair      text v = forsuffixes i=v : save i ; pair      i ; endfor ; enddef ;
+
+%D Sometimes we don't want parts of the graphics add to the
+%D bounding box. One way of doing this is to save the bounding
+%D box, draw the graphics that may not count, and restore the
+%D bounding box.
+%D
+%D \starttyping
+%D push_boundingbox currentpicture;
+%D pop_boundingbox currentpicture;
+%D \stoptyping
+%D
+%D The bounding box can be called with:
+%D
+%D \starttyping
+%D boundingbox currentpicture
+%D inner_boundingbox currentpicture
+%D outer_boundingbox currentpicture
+%D \stoptyping
+%D
+%D Especially the latter one can be of use when we include
+%D the graphic in a document that is clipped to the bounding
+%D box. In such occasions one can use:
+%D
+%D \starttyping
+%D set_outer_boundingbox currentpicture;
+%D \stoptyping
+%D
+%D Its counterpart is:
+%D
+%D \starttyping
+%D set_inner_boundingbox p
+%D \stoptyping
+
+path    mfun_boundingbox_stack[] ;
+numeric mfun_boundingbox_stack_depth ;
+
+mfun_boundingbox_stack_depth := 0 ;
+
+def pushboundingbox text p =
+    mfun_boundingbox_stack_depth := mfun_boundingbox_stack_depth + 1 ;
+    mfun_boundingbox_stack[mfun_boundingbox_stack_depth] := boundingbox p ;
+enddef ;
+
+def popboundingbox text p =
+    setbounds p to mfun_boundingbox_stack[mfun_boundingbox_stack_depth] ;
+    mfun_boundingbox_stack[mfun_boundingbox_stack_depth] := origin -- cycle ;
+    mfun_boundingbox_stack_depth := mfun_boundingbox_stack_depth - 1 ;
+enddef ;
+
+% let push_boundingbox = pushboundingbox ; % downward compatible
+% let pop_boundingbox  = popboundingbox  ; % downward compatible
+
+vardef boundingbox primary p =
+    if (path p) or (picture p) :
+        llcorner p -- lrcorner p -- urcorner p -- ulcorner p
+    else :
+        origin
+    fi -- cycle
+enddef;
+
+vardef innerboundingbox primary p =
+    top  rt llcorner p --
+    top lft lrcorner p --
+    bot lft urcorner p --
+    bot  rt ulcorner p -- cycle
+enddef;
+
+vardef outerboundingbox primary p =
+    bot lft llcorner p --
+    bot  rt lrcorner p --
+    top  rt urcorner p --
+    top lft ulcorner p -- cycle
+enddef;
+
+% def inner_boundingbox = innerboundingbox enddef ;
+% def outer_boundingbox = outerboundingbox enddef ;
+%
+% vardef set_inner_boundingbox text q = % obsolete
+%     setbounds q to innerboundingbox q;
+% enddef;
+%
+% vardef set_outer_boundingbox text q = % obsolete
+%     setbounds q to outerboundingbox q;
+% enddef;
+
+% secondarydef a boundedto b = % will this cleanup ?
+%     hide(picture mfun_a_b ; mfun_a_b := a ; setbounds mfun_a_b to b;)
+%     mfun_a_b
+% enddef ;
+
+%D Here are some special ones, cooked up in the process of Alan's mp-node
+%D module:
+
+vardef boundingradius primary p =
+    if picture p :
+        max(
+            abs((llcorner p) shifted -center p),
+            abs((lrcorner p) shifted -center p),
+            abs((urcorner p) shifted -center p),
+            abs((ulcorner p) shifted -center p)
+        )
+    elseif pen p :
+        boundingradius image(draw makepath p ;)
+    elseif path p :
+        boundingradius image(draw p ;)
+    fi
+enddef ;
+
+vardef boundingcircle primary p =
+    fullcircle scaled 2boundingradius p shifted center p
+enddef ;
+
+vardef boundingpoint@#(expr p) =
+    if picture p : % pen?
+        (                 mfun_labxf@# *ulcorner p
+         +                mfun_labyf@# *lrcorner p
+         +(1-mfun_labxf@#-mfun_labyf@#)*urcorner p)
+    elseif path p :
+        boundingpoint@#(image(draw p ;))
+   %elseif pair p :
+   %    p
+   %else :
+   %    origin
+    fi
+enddef ;
+
+permanent pushboundingbox, popboundingbox, boundingbox, innerboundingbox, outerboundingbox,
+    boundingradius, boundingcircle, boundingpoint ;
+
+%D Whatever:
+
+def mirrored primary a =
+    a scaled -1
+enddef ;
+
+primarydef a mirroredabout b =
+    (a shifted -b) scaled -1 shifted b
+enddef ;
+
+permanent mirrored, mirroredabout ;
+
+%D Some missing functions can be implemented rather straightforward (thanks to
+%D Taco and others):
+
+% oldpi := 3.14159265358979323846 ; % from <math.h>
+pi      := 3.14159265358979323846264338327950288419716939937510 ; % 50 digits
+radian  := 180/pi ; % 2pi*radian = 360 ;
+
+permanent pi, radian ;
+
+% let +++ = ++ ;
+
+vardef sqr  primary x = x*x                                 enddef ;
+vardef log  primary x = if x=0: 0 else: mlog(x)/mlog(10) fi enddef ;
+vardef ln   primary x = if x=0: 0 else: mlog(x)/256 fi      enddef ;
+vardef exp  primary x = (mexp 256)**x                       enddef ;
+vardef inv  primary x = if x=0: 0 else: x**-1 fi            enddef ;
+
+vardef pow (expr x,p) = x**p                                enddef ;
+
+vardef tand   primary x = sind(x)/cosd(x)  enddef ;
+vardef cotd   primary x = cosd(x)/sind(x)  enddef ;
+
+%      sin    primary x = sind(x*radian)   enddef ;
+%      cos    primary x = cosd(x*radian)   enddef ;
+%      tan    primary x = sin(x)/cos(x)    enddef ;
+vardef cot    primary x = cos(x)/sin(x)    enddef ;
+
+%      asin   primary x = angle((1+-+x,x)) enddef ;
+%      acos   primary x = angle((x,1+-+x)) enddef ;
+%      atan   primary x = angle(1,x)       enddef ;
+
+%      invsin primary x = (asin(x))/radian enddef ;
+%      invcos primary x = (acos(x))/radian enddef ;
+%      invtan primary x = (atan(x))/radian enddef ;
+
+%      acosh  primary x = ln(x+(x+-+1))    enddef ;
+%      asinh  primary x = ln(x+(x++1))     enddef ;
+
+%      sinh   primary x = save xx ; xx = exp x ; (xx-1/xx)/2 enddef ;
+%      cosh   primary x = save xx ; xx = exp x ; (xx+1/xx)/2 enddef ;
+%      tanh   primary x = save xx ; xx = exp x ; (xx-1/xx)/(xx+1/xx) enddef ;
+
+%D Like mod, but useful for angles, it returns (-.5d,+.5d] and is used
+%D in for instance mp-chem.
+
+primarydef a zmod b = (-((b/2 - a) mod b) + b/2) enddef ;
+
+permanent sqr, log, ln, exp, inv, pow, tand, cotd, cot, zmod ;
+
+%D Sometimes this is handy:
+
+def undashed =
+    dashed nullpicture
+enddef ;
+
+permanent undashed ;
+
+%D We provide two macros for drawing stripes across a shape.
+%D The first method (with the n suffix) uses another method,
+%D slower in calculation, but more efficient when drawn. The
+%D first macro divides the sides into n equal parts. The
+%D first argument specifies the way the lines are drawn, while
+%D the second argument identifier the way the shape is to be
+%D drawn.
+%D
+%D \starttyping
+%D stripe_path_n
+%D   (dashed evenly withcolor blue)
+%D   (filldraw)
+%D   fullcircle xscaled 100 yscaled 40 shifted (50,50) withpen pencircle scaled 4;
+%D \stoptyping
+%D
+%D The a (or angle) alternative supports arbitrary angles and
+%D is therefore more versatile.
+%D
+%D \starttyping
+%D stripe_path_a
+%D   (withpen pencircle scaled 2 withcolor red)
+%D   (draw)
+%D   fullcircle xscaled 100 yscaled 40 withcolor blue;
+%D \stoptyping
+%D
+%D We have two alternatives, controlled by arguments or defaults (when arguments
+%D are zero).
+%D
+%D The newer and nicer interface is used as follows (triggered by a question by Mari):
+%D
+%D \starttyping
+%D draw image (draw fullcircle scaled 3cm shifted (0cm,0cm) withcolor green) numberstriped (1,10,3) withcolor red ;
+%D draw image (draw fullcircle scaled 3cm shifted (3cm,0cm) withcolor green) numberstriped (2,20,3) withcolor green ;
+%D draw image (draw fullcircle scaled 3cm shifted (3cm,3cm) withcolor green) numberstriped (3,10,5) withcolor blue ;
+%D draw image (draw fullcircle scaled 3cm shifted (0cm,3cm) withcolor green) numberstriped (4,20,5) withcolor yellow ;
+%D
+%D draw image (draw fullcircle scaled 3cm shifted (6cm,0cm) withcolor green) anglestriped (1,20,2) withcolor red ;
+%D draw image (draw fullcircle scaled 3cm shifted (9cm,0cm) withcolor green) anglestriped (2,40,2) withcolor green ;
+%D draw image (draw fullcircle scaled 3cm shifted (9cm,3cm) withcolor green) anglestriped (3,60,2) withcolor blue ;
+%D draw image (draw fullcircle scaled 3cm shifted (6cm,3cm) withcolor green) anglestriped (4,80,2) withcolor yellow ;
+%D
+%D draw image (
+%D     draw fullcircle scaled 3cm shifted (0cm,0cm) withcolor green withpen pencircle scaled 2mm ;
+%D     draw fullcircle scaled 2cm shifted (0cm,1cm) withcolor blue  withpen pencircle scaled 3mm ;
+%D ) shifted (9cm,0cm) numberstriped (1,10,3) withcolor red ;
+%D
+%D draw image (
+%D     draw fullcircle scaled 3cm shifted (0cm,0cm) withcolor green  withpen pencircle scaled 2mm ;
+%D     draw fullcircle scaled 2cm shifted (0cm,1cm) withcolor blue   withpen pencircle scaled 3mm ;
+%D ) shifted (12cm,0cm) numberstriped (2,10,3) withcolor red ;
+%D
+%D draw image (
+%D     draw fullcircle scaled 3cm shifted (0cm,0cm) withcolor green  withpen pencircle scaled 2mm ;
+%D     draw fullcircle scaled 2cm shifted (0cm,1cm) withcolor blue   withpen pencircle scaled 3mm ;
+%D ) shifted (9cm,5cm) numberstriped (3,10,3) withcolor red ;
+%D
+%D draw image (
+%D     draw fullcircle scaled 3cm shifted (0cm,0cm) withcolor green  withpen pencircle scaled 2mm ;
+%D     draw fullcircle scaled 2cm shifted (0cm,1cm) withcolor blue   withpen pencircle scaled 3mm ;
+%D ) shifted (12cm,5cm) numberstriped (4,10,3) withcolor red ;
+%D \stoptyping
+
+stripe_n     := 10;
+stripe_slot  :=  3;
+stripe_gap   :=  5;
+stripe_angle := 45;
+
+def mfun_tool_striped_number_action text extra =
+    for i = 1/used_n step 1/used_n until 1 :
+        draw point (1+i) of bounds -- point (3-i) of bounds withpen pencircle scaled penwidth extra ;
+    endfor ;
+    for i = 0 step 1/used_n until 1 :
+        draw point (3+i) of bounds -- point (1-i) of bounds withpen pencircle scaled penwidth extra ;
+    endfor ;
+enddef ;
+
+def mfun_tool_striped_set_options(expr option) =
+    save isinner, swapped ;
+    boolean isinner, swapped ;
+    if option = 1 :
+        isinner := false ;
+        swapped := false ;
+    elseif option = 2 :
+        isinner := true ;
+        swapped := false ;
+    elseif option = 3 :
+        isinner := false ;
+        swapped := true ;
+    elseif option = 4 :
+        isinner := true ;
+        swapped := true ;
+    else :
+        isinner := false ;
+        swapped := false ;
+    fi ;
+enddef ;
+
+vardef mfun_tool_striped_number(expr option, p, asked_n, asked_slot) text extra =
+    image (
+        begingroup ;
+        save pattern, shape, bounds, penwidth, used_n, used_slot ;
+        picture pattern, shape ; path bounds ; numeric used_s, used_slot ;
+        mfun_tool_striped_set_options(option) ;
+        used_slot := if asked_slot = 0 : stripe_slot else : asked_slot fi ;
+        used_n := if asked_n = 0 : stripe_n else : asked_n fi ;
+        shape := image(draw p) ;
+        bounds := boundingbox shape ;
+        penwidth := min(ypart urcorner shape - ypart llcorner shape, xpart urcorner shape - xpart llcorner shape) / (used_slot * used_n) ;
+        pattern := image (
+            if isinner :
+                mfun_tool_striped_number_action extra ;
+                for s within shape :
+                    if stroked s or filled s :
+                        clip currentpicture to pathpart s ;
+                    fi
+                endfor ;
+            else :
+                for s within shape :
+                    if stroked s or filled s :
+                        draw image (
+                            mfun_tool_striped_number_action extra ;
+                            clip currentpicture to pathpart s ;
+                        ) ;
+                    fi ;
+                endfor ;
+            fi ;
+        ) ;
+        if swapped :
+            addto currentpicture also shape ;
+            addto currentpicture also pattern ;
+        else :
+            addto currentpicture also pattern ;
+            addto currentpicture also shape ;
+        fi ;
+        endgroup ;
+    )
+enddef ;
+
+def mfun_tool_striped_angle_action text extra =
+    for i = minimum -.5used_gap step used_gap until maximum :
+        draw (minimum,i) -- (maximum,i) extra ;
+    endfor ;
+    currentpicture := currentpicture rotated used_angle ;
+enddef ;
+
+vardef mfun_tool_striped_angle(expr option, p, asked_angle, asked_gap) text extra =
+    image (
+        begingroup ;
+        save pattern, shape, mask, maximum, minimum, centrum, used_angle, used_gap ;
+        picture pattern, shape, mask ; numeric maximum, minimum ; pair centrum ; numeric used_angle, used_gap ;
+        mfun_tool_striped_set_options(option) ;
+        used_angle := if asked_angle = 0 : stripe_angle else : asked_angle fi ;
+        used_gap := if asked_gap = 0 : stripe_gap else : asked_gap fi ;
+        shape := image(draw p) ;
+        centrum := center shape ;
+        shape := shape shifted - centrum ;
+        mask := shape rotated used_angle ;
+        maximum := max (xpart llcorner mask, xpart urcorner mask, ypart llcorner mask, ypart urcorner mask) ;
+        minimum := min (xpart llcorner mask, xpart urcorner mask, ypart llcorner mask, ypart urcorner mask) ;
+        pattern := image (
+            if isinner :
+                mfun_tool_striped_angle_action extra ;
+                for s within shape :
+                    if stroked s or filled s :
+                        clip currentpicture to pathpart s ;
+                    fi
+                endfor ;
+            else :
+                for s within shape :
+                    if stroked s or filled s :
+                        draw image (
+                            mfun_tool_striped_angle_action extra ;
+                            clip currentpicture to pathpart s ;
+                        ) ;
+                    fi ;
+                endfor ;
+            fi ;
+        ) ;
+        if swapped :
+            addto currentpicture also shape ;
+            addto currentpicture also pattern ;
+        else :
+            addto currentpicture also pattern ;
+            addto currentpicture also shape ;
+        fi ;
+        currentpicture := currentpicture shifted centrum ;
+        endgroup ;
+    )
+enddef;
+
+newinternal striped_normal_inner  ; striped_normal_inner  := 1 ;
+newinternal striped_reverse_inner ; striped_reverse_inner := 2 ;
+newinternal striped_normal_outer  ; striped_normal_outer  := 3 ;
+newinternal striped_reverse_outer ; striped_reverse_outer := 4 ;
+
+secondarydef p anglestriped s =
+    mfun_tool_striped_angle(redpart s,p,greenpart s,bluepart s)
+enddef ;
+
+secondarydef p numberstriped s =
+    mfun_tool_striped_number(redpart s,p,greenpart s,bluepart s)
+enddef ;
+
+% for old times sake:
+
+def stripe_path_n (text asked_spec) (text asked_draw) expr asked_path =
+    do_stripe_path_n (asked_spec) (asked_draw) (asked_path)
+enddef;
+
+def do_stripe_path_n (text asked_spec) (text asked_draw) (expr asked_path) text asked_text =
+    draw image(asked_draw asked_path asked_text) numberstriped(3,0,0) asked_spec ;
+enddef ;
+
+def stripe_path_a (text asked_spec) (text asked_draw) expr asked_path =
+    do_stripe_path_a (asked_spec) (asked_draw) (asked_path)
+enddef;
+
+def do_stripe_path_a (text asked_spec) (text asked_draw) (expr asked_path) text asked_text =
+    draw image(asked_draw asked_path asked_text) anglestriped(3,0,0) asked_spec ;
+enddef ;
+
+%D A few normalizing macros:
+
+primarydef p xsized w =
+    (p if (bbwidth (p) > 0) and (w > 0) : scaled (w/bbwidth (p)) fi)
+enddef ;
+
+primarydef p ysized h =
+    (p if (bbheight(p) > 0) and (h > 0) : scaled (h/bbheight(p)) fi)
+enddef ;
+
+primarydef p xysized s =
+    begingroup
+    save wh, w, h ; pair wh ; numeric w, h ;
+    wh := paired (s) ; w := bbwidth(p) ; h := bbheight(p) ;
+    p
+        if (w>0) and (h>0) :
+            if xpart wh > 0 : xscaled (xpart wh/w) fi
+            if ypart wh > 0 : yscaled (ypart wh/h) fi
+        fi
+    endgroup
+enddef ;
+
+let sized = xysized ;
+
+permanent xsized, ysized, xysized, sized ;
+
+def xscale_currentpicture(expr w) = % obsolete
+    currentpicture := currentpicture xsized w ;
+enddef;
+
+def yscale_currentpicture(expr h) = % obsolete
+    currentpicture := currentpicture ysized h ;
+enddef;
+
+def xyscale_currentpicture(expr w, h) = % obsolete
+    currentpicture := currentpicture xysized (w,h) ;
+enddef;
+
+def scale_currentpicture(expr w, h) = % obsolete
+    currentpicture := currentpicture xsized w ;
+    currentpicture := currentpicture ysized h ;
+enddef;
+
+%D A full circle is centered at the origin, while a unitsquare
+%D is located in the first quadrant. Now guess what kind of
+%D path fullsquare and unitcircle do return.
+
+path fullsquare, unitcircle ;
+
+fullsquare := unitsquare shifted - center unitsquare ;
+unitcircle := fullcircle shifted urcorner fullcircle ;
+
+%D Some more paths:
+
+path urcircle, ulcircle, llcircle, lrcircle ;
+
+urcircle := origin -- (+.5,0) & (+.5,0){up}    .. (0,+.5) & (0,+.5) -- cycle ;
+ulcircle := origin -- (0,+.5) & (0,+.5){left}  .. (-.5,0) & (-.5,0) -- cycle ;
+llcircle := origin -- (-.5,0) & (-.5,0){down}  .. (0,-.5) & (0,-.5) -- cycle ;
+lrcircle := origin -- (0,-.5) & (0,-.5){right} .. (+.5,0) & (+.5,0) -- cycle ;
+
+path tcircle, bcircle, lcircle, rcircle ;
+
+tcircle = origin -- (+.5,0) & (+.5,0) {up}    .. (0,+.5) .. {down}  (-.5,0) -- cycle ;
+bcircle = origin -- (-.5,0) & (-.5,0) {down}  .. (0,-.5) .. {up}    (+.5,0) -- cycle ;
+lcircle = origin -- (0,+.5) & (0,+.5) {left}  .. (-.5,0) .. {right} (0,-.5) -- cycle ;
+rcircle = origin -- (0,-.5) & (0,-.5) {right} .. (+.5,0) .. {left}  (0,+.5) -- cycle ;
+
+path urtriangle, ultriangle, lltriangle, lrtriangle ; % watch out: it's contrary to what you expect and starts in the origin
+
+urtriangle := origin -- (+.5,0) -- (0,+.5) -- cycle ;
+ultriangle := origin -- (0,+.5) -- (-.5,0) -- cycle ;
+lltriangle := origin -- (-.5,0) -- (0,-.5) -- cycle ;
+lrtriangle := origin -- (0,-.5) -- (+.5,0) -- cycle ;
+
+path triangle, uptriangle, downtriangle, lefttriangle, righttriangle ;
+
+triangle      := (1,0) -- (1,0) rotated 120 -- (1,0) rotated -120 -- cycle ;
+
+uptriangle    := triangle rotated  90 ;
+downtriangle  := triangle rotated -90 ;
+lefttriangle  := triangle rotated 180 ;
+righttriangle := triangle ;
+
+path unitdiamond, fulldiamond ;
+
+unitdiamond := (.5,0) -- (1,.5) -- (.5,1) -- (0,.5) -- cycle ;
+fulldiamond := unitdiamond shifted - center unitdiamond ;
+
+permanent
+    fullsquare, unitcircle,
+    urcircle, ulcircle, llcircle, lrcircle,
+    tcircle, bcircle, lcircle, rcircle,
+    urtriangle, ultriangle, lltriangle, lrtriangle,
+    triangle, uptriangle, downtriangle, lefttriangle, righttriangle,
+    unitdiamond, fulldiamond ;
+
+%D More robust:
+
+% let  normalscaled =  scaled ;
+% let normalxscaled = xscaled ;
+% let normalyscaled = yscaled ;
+%
+% def  scaled expr s =  normalscaled (s) enddef ;
+% def xscaled expr s = normalxscaled (s) enddef ;
+% def yscaled expr s = normalyscaled (s) enddef ;
+
+%D Shorter
+
+primarydef p xyscaled q = % secundarydef does not work out well
+    begingroup
+    save qq ; pair qq ;
+    qq = paired(q) ;
+    p
+        if xpart qq <> 0 : xscaled (xpart qq) fi
+        if ypart qq <> 0 : yscaled (ypart qq) fi
+    endgroup
+enddef ;
+
+permanent xyscaled ;
+
+%D Some personal code that might move to another module (todo: save).
+
+def set_grid(expr w, h, nx, ny) =
+    boolean grid[][] ; boolean grid_full ;
+    numeric grid_w, grid_h, grid_nx, grid_ny, grid_x, grid_y, grid_left ;
+    grid_w := w ;
+    grid_h := h ;
+    grid_nx := nx ;
+    grid_ny := ny ;
+    grid_x := round(w/grid_nx) ; % +.5) ;
+    grid_y := round(h/grid_ny) ; % +.5) ;
+    grid_left := (1+grid_x)*(1+grid_y) ;
+    grid_full := false ;
+    for i=0 upto grid_x :
+        for j=0 upto grid_y :
+            grid[i][j] := false ;
+        endfor ;
+    endfor ;
+enddef ;
+
+vardef new_on_grid(expr grid_dx, grid_dy) =
+    dx := grid_dx ;
+    dy := grid_dy ;
+    ddx := min(round(dx/grid_nx),grid_x) ; % +.5),grid_x) ;
+    ddy := min(round(dy/grid_ny),grid_y) ; % +.5),grid_y) ;
+    if not grid_full and not grid[ddx][ddy] :
+        grid[ddx][ddy] := true ;
+        grid_left := grid_left-1 ;
+        grid_full := (grid_left=0) ;
+        true
+    else :
+        false
+    fi
+enddef ;
+
+%D usage: \type{innerpath peepholed outerpath}.
+%D
+%D beginfig(1);
+%D   def fullsquare = (unitsquare shifted -center unitsquare) enddef ;
+%D   fill (fullsquare scaled 200) withcolor red ;
+%D   path p ; p := (fullcircle scaled 100) ; bboxmargin := 0 ;
+%D   fill p peepholed bbox p ;
+%D endfig;
+
+secondarydef p peepholed q =
+    begingroup
+    save start ; pair start ;
+    start := point 0 of p ;
+    if xpart start >= xpart center p :
+        if ypart start >= ypart center p :
+            urcorner q -- ulcorner q -- llcorner q -- lrcorner q --
+            reverse  p -- lrcorner q -- cycle
+        else :
+            lrcorner q -- urcorner q -- ulcorner q -- llcorner q --
+            reverse  p -- llcorner q -- cycle
+        fi
+    else :
+        if ypart start > ypart center p :
+            ulcorner q -- llcorner q -- lrcorner q -- urcorner q --
+            reverse  p -- urcorner q -- cycle
+        else :
+            llcorner q -- lrcorner q -- urcorner q -- ulcorner q --
+            reverse  p -- ulcorner q -- cycle
+        fi
+    fi
+    endgroup
+enddef ;
+
+boolean intersection_found ;
+
+secondarydef p intersection_point q =
+    begingroup
+    save temp_x, temp_y ;
+    (temp_x,temp_y) = p intersectiontimes q ;
+    if temp_x < 0 :
+        intersection_found := false ;
+        center p % origin
+    else :
+        intersection_found := true ;
+        .5[point temp_x of p, point temp_y of q]
+    fi
+    endgroup
+enddef ;
+
+%D New, undocumented, experimental:
+
+vardef tensecircle (expr width, height, offset) =
+    (-width/2,-height/2) ... (0,-height/2-offset) ...
+    (+width/2,-height/2) ... (+width/2+offset,0)  ...
+    (+width/2,+height/2) ... (0,+height/2+offset) ...
+    (-width/2,+height/2) ... (-width/2-offset,0)  ... cycle
+enddef ;
+
+vardef roundedsquare (expr width, height, offset) =
+    (offset,0)            -- (width-offset,0)      {right} ..
+    (width,offset)        -- (width,height-offset) {up}    ..
+    (width-offset,height) -- (offset,height)       {left}  ..
+    (0,height-offset)     -- (0,offset)            {down}  .. cycle
+enddef ;
+
+vardef roundedsquarexy (expr width, height, dx, dy) =
+    (dx,0)            -- (width-dx,0)      {right} ..
+    (width,dy)        -- (width,height-dy) {up}    ..
+    (width-dx,height) -- (dx,height)       {left}  ..
+    (0,height-dy)     -- (0,dy)            {down}  .. cycle
+enddef ;
+
+permanent tensecircle, roundedsquare, roundedsquarexy ;
+
+%D Some colors.
+
+def resolvedcolor(expr s) =
+    .5white
+enddef ;
+
+let normalwithcolor = withcolor ;
+
+def withcolor expr c =
+     normalwithcolor if string c : resolvedcolor(c) else : c fi
+enddef ;
+
+permanent resolvedcolor, normalwithcolor, withcolor ;
+
+% I don't want a "withcolor black" in case of an empty string ... who knows
+% how that can interfere with outer colors. Somehow the next one doesn't
+% always work out ok, but why ... must be some parsing issue. Anyway, when
+% we cannot do that, we need to fix some chem macros instead as empty strings
+% now lead to black while everywhere else in context empty means: leave color
+% untouched.
+
+% def withcolor expr c =
+%     if not string c :
+%         normalwithcolor c
+%     elseif c <> "" :
+%         normalwithcolor resolvedcolor(c)
+%     fi
+% enddef ;
+
+% So why does this work better than the above:
+%
+% def withcolor expr c =
+%     if string c :
+%         if c <> "" :
+%             normalwithcolor resolvedcolor(c)
+%         fi
+%     else :
+%         normalwithcolor c
+%     fi
+% enddef ;
+
+vardef colortype expr c =
+        if cmykcolor c : cmykcolor
+    elseif rgbcolor  c : rgbcolor
+    elseif numeric   c : grayscale
+        fi
+enddef ;
+
+vardef whitecolor expr c =
+        if cmykcolor c : (0,0,0,0)
+    elseif rgbcolor  c : (1,1,1)
+    elseif numeric   c : 1
+    elseif string    c : whitecolor resolvedcolor(c)
+        fi
+enddef ;
+
+vardef blackcolor expr c =
+        if cmykcolor c : (0,0,0,1)
+    elseif rgbcolor  c : (0,0,0)
+    elseif numeric   c : 0
+    elseif string    c : blackcolor resolvedcolor(c)
+        fi
+enddef ;
+
+vardef complementary expr c =
+        if cmykcolor c : (1,1,1,1) - c
+    elseif rgbcolor  c : (1,1,1) - c
+    elseif pair      c : (1,1) - c
+    elseif numeric   c :  1 - c
+    elseif string    c : complementary resolvedcolor(c)
+        fi
+enddef ;
+
+vardef complemented expr c =
+    save m ;
+        if cmykcolor c : m := max(cyanpart c, magentapart c, yellowpart c, blackpart c) ;
+                         (m,m,m,m) - c
+    elseif rgbcolor  c : m := max(redpart c, greenpart c, bluepart c) ;
+                         (m,m,m) - c
+    elseif pair      c : m := max(xpart c, ypart c) ;
+                         (m,m) - c
+    elseif numeric   c : m - c
+    elseif string    c : complemented resolvedcolor(c)
+        fi
+enddef ;
+
+permanent colortype, whitecolor, blackcolor, complementary, complemented ;
+
+%D Well, this is the dangerous and naive version:
+
+% def drawfill text t =
+%     fill t ;
+%     draw t ;
+% enddef;
+
+%D This two step approach saves the path first, since it can
+%D be a function. Attributes must not be randomized.
+
+def drawfill expr c =
+    path temp_c ; temp_c := c ;
+    mfun_do_drawfill
+enddef ;
+
+def mfun_do_drawfill text t =
+    draw temp_c t ;
+    fill temp_c t ;
+enddef;
+
+def undrawfill expr c =
+    drawfill c withcolor background % rather useless
+enddef ;
+
+permanent drawfill, undrawfill ;
+
+%D Moved from mp-char.mp
+
+vardef paired primary d =
+    if pair d : d else : (d,d) fi
+enddef ;
+
+vardef tripled primary d =
+    if color d : d else : (d,d,d) fi
+enddef ;
+
+permanent paired, tripled ;
+
+% maybe secondaries:
+
+primarydef p enlarged       d = ( p llmoved d -- p lrmoved d -- p urmoved d -- p ulmoved d -- cycle ) enddef ;
+primarydef p llenlarged     d = ( p llmoved d -- lrcorner p  -- urcorner p  -- ulcorner p  -- cycle ) enddef ;
+primarydef p lrenlarged     d = ( llcorner p  -- p lrmoved d -- urcorner p  -- ulcorner p  -- cycle ) enddef ;
+primarydef p urenlarged     d = ( llcorner p  -- lrcorner p  -- p urmoved d -- ulcorner p  -- cycle ) enddef ;
+primarydef p ulenlarged     d = ( llcorner p  -- lrcorner p  -- urcorner p  -- p ulmoved d -- cycle ) enddef ;
+
+primarydef p llmoved        d = ( (llcorner p) shifted (-xpart paired(d),-ypart paired(d)) ) enddef ;
+primarydef p lrmoved        d = ( (lrcorner p) shifted (+xpart paired(d),-ypart paired(d)) ) enddef ;
+primarydef p urmoved        d = ( (urcorner p) shifted (+xpart paired(d),+ypart paired(d)) ) enddef ;
+primarydef p ulmoved        d = ( (ulcorner p) shifted (-xpart paired(d),+ypart paired(d)) ) enddef ;
+
+primarydef p leftenlarged   d = ( (llcorner p) shifted (-d,0) -- lrcorner p -- urcorner p -- (ulcorner p) shifted (-d,0) -- cycle ) enddef ;
+primarydef p rightenlarged  d = ( llcorner p -- (lrcorner p) shifted (d,0) -- (urcorner p) shifted (d,0) -- ulcorner p -- cycle   ) enddef ;
+primarydef p topenlarged    d = ( llcorner p -- lrcorner p -- (urcorner p) shifted (0,d) -- (ulcorner p) shifted (0,d) -- cycle   ) enddef ;
+primarydef p bottomenlarged d = ( llcorner p shifted (0,-d) -- lrcorner p shifted (0,-d) -- urcorner p -- ulcorner p -- cycle     ) enddef ;
+
+
+permanent
+    enlarged, llenlarged, lrenlarged, urenlarged, ulenlarged,
+    llmoved, lrmoved, urmoved, ulmoved,
+    leftenlarged, rightenlarged, topenlarged, bottomenlarged ;
+
+%D Handy as stepper:
+
+vardef rotation(expr i, n) =
+    if (n == 0) : 0 else : i * 360 / n fi
+enddef ;
+
+
+permanent rotation ;
+
+%D Handy for testing/debugging; the ladders are for math:
+
+primarydef p crossed d = (
+    if pair p :
+        p shifted (-d, 0) -- p --
+        p shifted ( 0,-d) -- p --
+        p shifted (+d, 0) -- p --
+        p shifted ( 0,+d) -- p -- cycle
+    else :
+        center p shifted (-d, 0) -- llcorner p --
+        center p shifted ( 0,-d) -- lrcorner p --
+        center p shifted (+d, 0) -- urcorner p --
+        center p shifted ( 0,+d) -- ulcorner p -- cycle
+    fi
+) enddef ;
+
+vardef laddered primary p = % was expr
+    point 0 of p
+    for i=1 upto length(p) :
+        -- (xpart (point i of p), ypart (point (i-1) of p)) -- (point i of p)
+    endfor
+enddef ;
+
+permanent crossed, laddered ;
+
+%D Saves typing:
+
+% vardef bottomboundary primary p = (llcorner p -- lrcorner p) enddef ;
+% vardef rightboundary  primary p = (lrcorner p -- urcorner p) enddef ;
+% vardef topboundary    primary p = (urcorner p -- ulcorner p) enddef ;
+% vardef leftboundary   primary p = (ulcorner p -- llcorner p) enddef ;
+
+vardef bottomboundary primary p = if pair p : p else : (llcorner p -- lrcorner p) fi enddef ;
+vardef rightboundary  primary p = if pair p : p else : (lrcorner p -- urcorner p) fi enddef ;
+vardef topboundary    primary p = if pair p : p else : (urcorner p -- ulcorner p) fi enddef ;
+vardef leftboundary   primary p = if pair p : p else : (ulcorner p -- llcorner p) fi enddef ;
+
+permanent bottomboundary, rightboundary, topboundary, leftboundary ;
+
+%D Nice too:
+
+primarydef p superellipsed s =
+    superellipse (
+        .5[lrcorner p,urcorner p],
+        .5[urcorner p,ulcorner p],
+        .5[ulcorner p,llcorner p],
+        .5[llcorner p,lrcorner p],
+        s
+    )
+enddef ;
+
+primarydef p squeezed s = (
+    (llcorner p .. .5[llcorner p,lrcorner p] shifted ( 0, ypart paired(s)) .. lrcorner p) &
+    (lrcorner p .. .5[lrcorner p,urcorner p] shifted (-xpart paired(s), 0) .. urcorner p) &
+    (urcorner p .. .5[urcorner p,ulcorner p] shifted ( 0,-ypart paired(s)) .. ulcorner p) &
+    (ulcorner p .. .5[ulcorner p,llcorner p] shifted ( xpart paired(s), 0) .. llcorner p) & cycle
+) enddef ;
+
+primarydef p randomshifted s =
+    begingroup ;
+    save ss ; pair ss ;
+    ss := paired(s) ;
+    p shifted (-.5xpart ss + uniformdeviate xpart ss,-.5ypart ss + uniformdeviate ypart ss)
+    endgroup
+enddef ;
+
+vardef mfun_randomized_path(expr p,s) =
+    for i=0 upto length(p)-1 :
+         (point       i    of p) .. controls
+        ((postcontrol i    of p) randomshifted s) and
+        ((precontrol (i+1) of p) randomshifted s) ..
+    endfor
+    if cycle p :
+        cycle
+    else :
+        (point length(p) of p)
+    fi
+enddef;
+
+vardef mfun_randomized_picture(expr p,s)(text rnd) =
+    save currentpicture ;
+    picture currentpicture ;
+    currentpicture := nullpicture ;
+    for i within p :
+        addto currentpicture
+            if stroked i :
+                doublepath pathpart i rnd s
+                dashed dashpart i
+                withpen penpart i
+                withcolor colorpart i
+                withprescript prescriptpart i
+                withpostscript postscriptpart i
+            elseif filled i :
+                contour pathpart i rnd s
+                withpen penpart i
+                withcolor colorpart i
+                withprescript prescriptpart i
+                withpostscript postscriptpart i
+            else :
+                also i
+            fi
+        ;
+    endfor ;
+    currentpicture
+enddef ;
+
+primarydef p randomizedcontrols s = (
+    if path p :
+        mfun_randomized_path(p,s)
+    elseif picture p :
+        mfun_randomized_picture(p,s)(randomizedcontrols)
+    else :
+        p randomized s
+    fi
+) enddef ;
+
+primarydef p randomized s = (
+    if path p :
+        for i=0 upto length(p)-1 :
+            ((point       i    of p) randomshifted s) .. controls
+            ((postcontrol i    of p) randomshifted s) and
+            ((precontrol (i+1) of p) randomshifted s) ..
+        endfor
+        if cycle p :
+            cycle
+        else :
+            ((point length(p) of p) randomshifted s)
+        fi
+    elseif pair p :
+        p randomshifted s
+    elseif cmykcolor p :
+        if cmykcolor s :
+           ((uniformdeviate cyanpart    s) * cyanpart    p,
+            (uniformdeviate magentapart s) * magentapart p,
+            (uniformdeviate yellowpart  s) * yellowpart  p,
+            (uniformdeviate blackpart   s) * blackpart   p)
+        elseif pair s :
+            ((xpart s + (uniformdeviate (ypart s - xpart s))) * p)
+        else :
+            ((uniformdeviate s) * p)
+        fi
+    elseif rgbcolor p :
+        if rgbcolor s :
+           ((uniformdeviate redpart   s) * redpart   p,
+            (uniformdeviate greenpart s) * greenpart p,
+            (uniformdeviate bluepart  s) * bluepart  p)
+        elseif pair s :
+           ((xpart s + (uniformdeviate (ypart s - xpart s))) * p)
+        else :
+           ((uniformdeviate s) * p)
+        fi
+    elseif color p :
+        if color s :
+            ((uniformdeviate greypart s) * greypart p)
+        elseif pair s :
+            ((xpart s + (uniformdeviate (ypart s - xpart s))) * p)
+        else :
+            ((uniformdeviate s) * p)
+        fi
+    elseif string p :
+        (resolvedcolor(p)) randomized s
+    elseif picture p :
+        mfun_randomized_picture(p,s)(randomized)
+    else :
+      % p - s/2 + uniformdeviate s % would have been better but we want to be positive
+        p + uniformdeviate s
+    fi
+) enddef ;
+
+permanent superellipsed, squeezed, randomshifted, randomized, randomizedcontrols ;
+
+%D Not perfect (alternative for interpath)
+
+vardef interpolated(expr s, p, q) =
+    save m ; numeric m ;
+    m := max(length(p),length(q)) ;
+    if path p :
+        for i=0 upto m-1 :
+            s[point       (i   /m) along p,point       (i   /m) along q] .. controls
+            s[postcontrol (i   /m) along p,postcontrol (i   /m) along q] and
+            s[precontrol ((i+1)/m) along p,precontrol ((i+1)/m) along q] ..
+        endfor
+        if cycle p :
+            cycle
+        else :
+            s[point infinity of p,point infinity of q]
+        fi
+    else :
+        a[p,q]
+    fi
+enddef ;
+
+permanent interpolated ;
+
+%D Interesting too:
+
+% primarydef p paralleled d = (
+%     p shifted if d < 0 : - fi ((point abs(d) on (p rotatedaround(point 0 of p,90))) - point 0 of p)
+% ) enddef ;
+%
+% primarydef p paralleled d = (
+%     p shifted ((d*unitvector(direction 0 of p) - point 0 of p) rotated 90)
+% ) enddef ;
+%
+% Alan came up with an improved version and stepwise we ended up with (or
+% might up with a variant of):
+
+def istextext(expr p) =
+    (picture p and ((substring(0,3) of prescriptpart p) = "tx_"))
+enddef ;
+
+vardef perpendicular expr t of p =
+    unitvector((direction t of p) rotated 90)
+enddef ;
+
+primarydef p paralleled d = (
+    if path p :
+        begingroup ;
+        save dp ; pair dp ;
+        for i=0 upto length p if cycle p : -1 fi :
+            hide(dp := d * perpendicular i of p)
+            if i > 0 : .. fi
+            (point i of p + dp)
+            if i < length p :
+                .. controls (postcontrol i    of p + dp) and
+                            (precontrol (i+1) of p + dp)
+            fi
+        endfor
+        if cycle p : .. cycle fi
+        endgroup
+    elseif picture p :
+        image(
+            for i within p :
+                draw (pathpart i)
+                if not istextext(i) : % dirty trick
+                    paralleled d
+                fi
+                mfun_decoration_i i ;
+            endfor ;
+        )
+    elseif pair p :
+        p
+    fi
+) enddef ;
+
+vardef punked primary p =
+    point 0 of p for i=1 upto length(p)-1 : -- point i of p endfor
+    if cycle p : -- cycle else : -- point length(p) of p fi
+enddef ;
+
+vardef curved primary p =
+    point 0 of p for i=1 upto length(p)-1 : .. point i of p endfor
+    if cycle p : .. cycle else : .. point length(p) of p fi
+enddef ;
+
+primarydef p blownup s =
+    begingroup
+        save temp_p ; path temp_p ;
+        temp_p := p xysized (bbwidth(p)+2(xpart paired(s)),bbheight(p)+2(ypart paired(s))) ;
+        (temp_p shifted (center p - center temp_p))
+    endgroup
+enddef ;
+
+permanent perpendicular, istextext, paralleled, punked, curved, blownup ;
+
+%D Rather fundamental.
+
+% not yet ok
+
+vardef mfun_left_right_path(expr p, l) = % used in s-pre-19
+    save q, r, t, b ; path q, r ; pair t, b ;
+    t := (ulcorner p -- urcorner p) intersection_point p ;
+    b := (llcorner p -- lrcorner p) intersection_point p ;
+    r := if xpart directionpoint t of p < 0 : reverse p else : p fi ; % r is needed, else problems when reverse is fed
+    q := r cutbefore if l: t else: b fi ;
+    q := q if xpart point 0 of r > 0 : & r fi cutafter  if l: b else: t fi ;
+    q
+enddef ;
+
+vardef  leftpath expr p = mfun_left_right_path(p,true ) enddef ;
+vardef rightpath expr p = mfun_left_right_path(p,false) enddef ;
+
+permanent leftpath, rightpath ;
+
+%D Drawoptions
+
+def saveoptions =
+    save base_draw_options ; def base_draw_options = enddef ;
+enddef ;
+
+permanent saveoptions ;
+
+%D Tracing. (not yet in lexer)
+
+let normaldraw = draw ;
+let normalfill = fill ;
+
+% bugged in mplib so ...
+
+def normalfill expr c = addto currentpicture contour c base_draw_options enddef ;
+def normaldraw expr p = addto currentpicture if picture p: also p else: doublepath p withpen currentpen fi base_draw_options enddef ;
+
+def drawlineoptions   (text t) = def mfun_opt_lin = t enddef ; enddef ;
+def drawpointoptions  (text t) = def mfun_opt_pnt = t enddef ; enddef ;
+def drawcontroloptions(text t) = def mfun_opt_ctr = t enddef ; enddef ;
+def drawlabeloptions  (text t) = def mfun_opt_lab = t enddef ; enddef ;
+def draworiginoptions (text t) = def mfun_opt_ori = t enddef ; enddef ;
+def drawboundoptions  (text t) = def mfun_opt_bnd = t enddef ; enddef ;
+def drawpathoptions   (text t) = def mfun_opt_pth = t enddef ; enddef ;
+
+numeric drawoptionsfactor ; drawoptionsfactor := pt ;
+
+def resetdrawoptions =
+    drawlineoptions   (withpen pencircle scaled 1.0 drawoptionsfactor withcolor .5white) ;
+    drawpointoptions  (withpen pencircle scaled 4.0 drawoptionsfactor withcolor   black) ;
+    drawcontroloptions(withpen pencircle scaled 2.5 drawoptionsfactor withcolor   black) ;
+    drawlabeloptions  () ;
+    draworiginoptions (withpen pencircle scaled 1.0 drawoptionsfactor withcolor .5white) ;
+    drawboundoptions  (dashed evenly mfun_opt_ori) ;
+    drawpathoptions   (withpen pencircle scaled 5.0 drawoptionsfactor withcolor .8white) ;
+enddef ;
+
+resetdrawoptions ;
+
+%D Path.
+
+def drawpath expr p =
+    normaldraw p mfun_opt_pth
+enddef ;
+
+permanent
+    drawlineoptions, drawpointoptions, drawcontroloptions, drawlabeloptions, draworiginoptions,
+    drawboundoptions, drawpathoptions, drawpath, normaldraw ;
+
+%D Arrow.
+
+newinternal ahvariant ; ahvariant := 0 ;
+newinternal ahdimple  ; ahdimple  := 1/5 ;
+newinternal ahscale   ; ahscale   := 3/4 ;
+
+permanent ahvariant, ahdimple, ahscale ;
+
+vardef arrowhead expr p =
+     save q, e, r ;
+     pair e ; e = point length p of p ;
+     path q ; q = gobble(p shifted -e cutafter makepath(pencircle scaled (2ahlength))) cuttings ;
+     if ahvariant > 0:
+         path r ; r = gobble(p shifted -e cutafter makepath(pencircle scaled ((1-ahdimple)*2ahlength))) cuttings ;
+     fi
+     (q rotated (ahangle/2) & reverse q rotated -(ahangle/2)
+         if ahvariant = 1 :
+             -- point 0 of r --
+         elseif ahvariant = 2 :
+             ... point 0 of r ...
+         else :
+         --
+         fi
+         cycle
+     ) shifted e
+enddef ;
+
+vardef drawarrowpath expr p =
+    save autoarrows ; boolean autoarrows ; autoarrows := true ;
+    drawarrow p mfun_opt_pth
+enddef ;
+
+def midarrowhead expr p =
+    arrowhead p cutafter (point length(p cutafter point .5 along p) + ahlength on p)
+enddef ;
+
+vardef arrowheadonpath (expr p, s) =
+    save autoarrows ; boolean autoarrows ;
+    autoarrows := true ;
+    set_ahlength(scaled ahfactor) ; % added
+    arrowhead p if s < 1 : cutafter (point (s*arclength(p) + (ahlength/2)) on p) fi
+enddef ;
+
+def resetarrows =
+    hide (
+        ahlength  := 4 ;
+        ahangle   := 45 ;
+        ahvariant := 0 ;
+        ahdimple  := 1/5 ;
+        ahscale   := 3/4 ;
+)
+enddef ;
+
+permanent arrowhead, drawarrowpath, midarrowhead, arrowheadonpath ;
+
+%D Points.
+
+vardef dotlabel@#(expr s,z) text t =
+    label@#(s,z) t ;
+    interim linecap := rounded ;
+    normaldraw z withpen pencircle scaled dotlabeldiam t ;
+enddef ;
+
+def drawpoint expr c =
+    if string c :
+        string temp_c ;
+        temp_c := "(" & c & ")" ;
+        dotlabel.urt(temp_c, scantokens temp_c) ;
+        drawdot scantokens temp_c
+    else :
+        dotlabel.urt("(" & decimal xpart c & "," & decimal ypart c & ")", c) ;
+        drawdot c
+    fi mfun_opt_pnt
+enddef ;
+
+%D PathPoints.
+
+def drawpoints        expr c = path temp_c ; temp_c := c ; mfun_draw_points        enddef ;
+def drawcontrolpoints expr c = path temp_c ; temp_c := c ; mfun_draw_controlpoints enddef ;
+def drawcontrollines  expr c = path temp_c ; temp_c := c ; mfun_draw_controllines  enddef ;
+def drawpointlabels   expr c = path temp_c ; temp_c := c ; mfun_draw_pointlabels   enddef ;
+
+def mfun_draw_points text t =
+    for i=0 upto length(temp_c) if cycle temp_c : -1 fi :
+        normaldraw point i of temp_c mfun_opt_pnt t ;
+    endfor ;
+enddef;
+
+def mfun_draw_controlpoints text t =
+    for i=0 upto length(temp_c) :
+        normaldraw precontrol  i of temp_c mfun_opt_ctr t ;
+        normaldraw postcontrol i of temp_c mfun_opt_ctr t ;
+    endfor ;
+enddef;
+
+def mfun_draw_controllines text t =
+    for i=0 upto length(temp_c) :
+        normaldraw point i of temp_c -- precontrol  i of temp_c mfun_opt_lin t ;
+        normaldraw point i of temp_c -- postcontrol i of temp_c mfun_opt_lin t ;
+    endfor ;
+enddef;
+
+boolean swappointlabels ; swappointlabels := false ;
+numeric pointlabelscale ; pointlabelscale := 0 ;
+string  pointlabelfont  ; pointlabelfont  := "" ;
+
+def mfun_draw_pointlabels text asked_options =
+    for i=0 upto length(temp_c) if cycle temp_c : -1 fi :
+        pair temp_u ; temp_u := unitvector(direction i of temp_c) rotated if swappointlabels : - fi 90 ;
+        pair temp_p ; temp_p := (point i of temp_c) ;
+        begingroup ;
+        if pointlabelscale > 0 :
+            save defaultscale ; numeric defaultscale ;
+            defaultscale := pointlabelscale ;
+        fi ;
+        if pointlabelfont <> "" :
+            save defaultfont ; string defaultfont ;
+            defaultfont := pointlabelfont ;
+        fi ;
+        temp_u := 10 * drawoptionsfactor * defaultscale * temp_u ;
+        normaldraw thelabel ( decimal i, temp_p shifted if cycle temp_c and (i=0) : - fi temp_u ) mfun_opt_lab asked_options ;
+        endgroup ;
+    endfor ;
+enddef;
+
+%D Bounding box.
+
+def drawboundingbox expr p =
+    normaldraw boundingbox p mfun_opt_bnd
+enddef ;
+
+%D Origin.
+
+numeric originlength ; originlength := .5cm ;
+
+def draworigin text t =
+    normaldraw (origin shifted (0, originlength) -- origin shifted (0,-originlength)) mfun_opt_ori t ;
+    normaldraw (origin shifted ( originlength,0) -- origin shifted (-originlength,0)) mfun_opt_ori t ;
+enddef;
+
+permanent dotlabel, swappointlabels, pointlabelscale, pointlabelfont ;
+permanent drawboundingbox, drawpoints, drawcontrolpoints, drawcontrollines, drawpointlabels, draworigin ;
+
+%D Axis.
+
+numeric tickstep   ; tickstep   := 5mm ;
+numeric ticklength ; ticklength := 2mm ;
+
+def drawxticks expr c = path temp_c ; temp_c := c ; mfun_draw_xticks enddef ;
+def drawyticks expr c = path temp_c ; temp_c := c ; mfun_draw_yticks enddef ;
+def drawticks  expr c = path temp_c ; temp_c := c ; mfun_draw_ticks  enddef ;
+
+% Adding eps prevents disappearance due to rounding errors.
+
+def mfun_draw_xticks text t =
+    for i=0 step -tickstep until xpart llcorner temp_c - eps :
+        if (i<=xpart lrcorner temp_c) :
+        normaldraw (i,-ticklength)--(i,ticklength) mfun_opt_ori t ;
+        fi ;
+    endfor ;
+    for i=0 step  tickstep until xpart lrcorner temp_c + eps :
+        if (i>=xpart llcorner temp_c) :
+            normaldraw (i,-ticklength)--(i,ticklength) mfun_opt_ori t ;
+        fi ;
+    endfor ;
+    normaldraw (llcorner temp_c -- ulcorner temp_c) shifted (-xpart llcorner temp_c,0) mfun_opt_ori t ;
+enddef ;
+
+def mfun_draw_yticks text t =
+    for i=0 step -tickstep until ypart llcorner temp_c - eps :
+        if (i<=ypart ulcorner temp_c) :
+            normaldraw (-ticklength,i)--(ticklength,i) mfun_opt_ori t ;
+        fi ;
+    endfor ;
+    for i=0 step  tickstep until ypart ulcorner temp_c + eps :
+        if (i>=ypart llcorner temp_c) :
+            normaldraw (-ticklength,i)--(ticklength,i) mfun_opt_ori t ;
+        fi ;
+    endfor ;
+    normaldraw (llcorner temp_c -- lrcorner temp_c) shifted (0,-ypart llcorner temp_c) mfun_opt_ori t ;
+enddef ;
+
+def mfun_draw_ticks text t =
+    drawxticks temp_c t ;
+    drawyticks temp_c t ;
+enddef ;
+
+%D All of it except axis.
+
+def drawwholepath expr p =
+    draworigin          ;
+    drawpath          p ;
+    drawcontrollines  p ;
+    drawcontrolpoints p ;
+    drawpoints        p ;
+    drawboundingbox   p ;
+    drawpointlabels   p ;
+enddef ;
+
+def drawpathonly expr p =
+    drawpath          p ;
+    drawcontrollines  p ;
+    drawcontrolpoints p ;
+    drawpoints        p ;
+    drawpointlabels   p ;
+enddef ;
+
+%D Tracing.
+
+def visualizeddraw expr c =
+    if picture c : normaldraw c else : path temp_c ; temp_c := c ; do_visualizeddraw fi
+enddef ;
+
+def visualizedfill expr c =
+    if picture c : normalfill c else : path temp_c ; temp_c := c ; do_visualizedfill fi
+enddef ;
+
+def do_visualizeddraw text t =
+    draworigin            ;
+    drawpath          temp_c t ;
+    drawcontrollines  temp_c ;
+    drawcontrolpoints temp_c ;
+    drawpoints        temp_c ;
+    drawboundingbox   temp_c ;
+    drawpointlabels   temp_c ;
+enddef ;
+
+def do_visualizedfill text t =
+    if cycle temp_c : normalfill temp_c t fi ;
+    draworigin            ;
+    drawcontrollines  temp_c ;
+    drawcontrolpoints temp_c ;
+    drawpoints        temp_c ;
+    drawboundingbox   temp_c ;
+    drawpointlabels   temp_c ;
+enddef ;
+
+def detaileddraw expr c =
+    if picture c : normaldraw c else : path temp_c ; temp_c := c ; do_detaileddraw fi
+enddef ;
+
+def do_detaileddraw text t =
+    drawpath          temp_c t ;
+    drawcontrollines  temp_c ;
+    drawcontrolpoints temp_c ;
+    drawpoints        temp_c ;
+  % % for labels we need an third run (as the second will mark the numbers); i could preroll them
+  % % but then the hash needs to handle that as well (as now we keep numbering)
+  % drawpointlabels   temp_c ;
+enddef ;
+
+def visualizepaths =
+    let fill = visualizedfill ;
+    let draw = visualizeddraw ;
+enddef ;
+
+def detailpaths =
+    let draw = detaileddraw ;
+enddef ;
+
+def naturalizepaths =
+    let fill = normalfill ;
+    let draw = normaldraw ;
+enddef ;
+
+extra_endfig := extra_endfig & " naturalizepaths ; " ;
+
+permanent
+    visualizeddraw, detaileddraw, visualizedfill,
+    visualizepaths, detailpaths, naturalizepaths ;
+
+%D Nice tracer:
+
+def drawboundary primary p =
+    draw p dashed evenly withcolor white ;
+    draw p dashed oddly  withcolor black ;
+    draw (- llcorner p) withpen pencircle scaled 3   withcolor white ;
+    draw (- llcorner p) withpen pencircle scaled 1.5 withcolor black ;
+enddef ;
+
+permanent drawboundary ;
+
+%D Also handy:
+
+extra_beginfig := extra_beginfig & " truecorners :=  0 ; "   ; % restores
+extra_beginfig := extra_beginfig & " miterlimit  := 10 ; "   ; % restores
+extra_beginfig := extra_beginfig & " linejoin := rounded ; " ; % restores
+extra_beginfig := extra_beginfig & " linecap  := rounded ; " ; % restores
+
+%D Normally, arrowheads don't scale well. So we provide a hack.
+
+boolean autoarrows ; autoarrows := false ;  % todo: newinternal boolean autoarrows ;
+numeric ahfactor   ; ahfactor   := 2.5 ;    % todo: newinternal         ahfactor ;
+
+permanent ahfactor, ahlength, autoarrows ;
+
+def set_ahlength (text t) = % called to often
+  % ahlength := (ahfactor*pen_size(base_draw_options t)) ; % base_draw_options added
+  % problem: base_draw_options can contain color so a no-go, we could apply the transform
+  % but i need to figure out the best way (fakepicture and take components).
+    ahlength := (ahfactor*pen_size(t)) ;
+enddef ;
+
+vardef pen_size (text t) =
+    save p ; picture p ; p := nullpicture ;
+    addto p doublepath (top origin -- bot origin) t ;
+    (ypart urcorner p - ypart lrcorner p)
+enddef ;
+
+%D The next two macros are adapted versions of plain
+%D \METAPOST\ definitions.
+
+vardef arrowpath expr p = % patch by Peter Rolf: supports squared pen and shifting (hh: maybe just use center of head as first)
+    (p cutafter makepath(pencircle
+        scaled (if ahvariant > 0 : (1-ahdimple)* fi 2ahlength*cosd(ahangle/2))
+        shifted point length p of p
+    ))
+enddef;
+
+permanent arrowpath ;
+
+% New experimental extension: also handling pictures:
+%
+% drawarrow fullsquare scaled 2cm withcolor green ;
+% drawarrow fullcircle scaled 3cm withcolor green ;
+% drawarrow image (
+%     draw fullsquare scaled 4cm withcolor red ;
+%     draw fullcircle scaled 5cm withcolor blue ;
+% ) ;
+% currentpicture := currentpicture shifted (-bbwidth(currentpicture)-1cm,0) ;
+% drawdblarrow fullsquare scaled 2cm withcolor green ;
+% drawdblarrow fullcircle scaled 3cm withcolor green ;
+% drawdblarrow image (
+%     draw fullsquare scaled 4cm withcolor red ;
+%     draw fullcircle scaled 5cm withcolor blue ;
+% ) ;
+
+vardef stroked_paths(expr p) =
+    save n ; numeric n ; n := 0 ;
+    for i within p :
+        if stroked i :
+            n := n + 1 ;
+        fi
+    endfor ;
+    n
+enddef ;
+
+def mfun_decoration_i expr i =
+    withpen penpart i
+    withcolor colorpart i
+    withprescript prescriptpart i
+    withpostscript postscriptpart i
+enddef ;
+
+% We could collapse all in one helper but in context we nowaways don't want
+% the added obscurity. Tokens come cheap.
+
+numeric mfun_arrow_snippets ;
+numeric mfun_arrow_count ;
+
+def drawarrow expr p =
+    begingroup ;
+    save mfun_arrow_path ;
+    path mfun_arrow_path ;
+    if path p :
+        mfun_arrow_path := p ;
+        expandafter mfun_draw_arrow_path
+    elseif picture p :
+        save mfun_arrow_picture ;
+        picture mfun_arrow_picture ;
+        mfun_arrow_picture := p ;
+        expandafter mfun_draw_arrow_picture
+    else :
+        expandafter mfun_draw_arrow_nothing
+    fi
+enddef ;
+
+def drawdblarrow expr p =
+    begingroup ;
+    save mfun_arrow_path ;
+    path mfun_arrow_path ;
+    if path p :
+        mfun_arrow_path := p ;
+        expandafter mfun_draw_arrow_path_double
+    elseif picture p :
+        save mfun_arrow_picture ;
+        picture mfun_arrow_picture ;
+        mfun_arrow_picture := p ;
+        expandafter mfun_draw_arrow_picture_double
+    else :
+        expandafter mfun_draw_arrow_nothing
+    fi
+enddef ;
+
+def mfun_draw_arrow_nothing text t =
+enddef ;
+
+% The path is shortened so that the arrow head extends it to the original
+% length. In case of a double arrow the path gets shortened twice.
+
+def mfun_draw_arrow_path text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    draw arrowpath mfun_arrow_path t ;
+    fillup arrowhead mfun_arrow_path t ;
+    endgroup ;
+enddef ;
+
+def mfun_draw_arrow_path_double text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    draw arrowpath (reverse arrowpath mfun_arrow_path) t ;
+    fillup arrowhead mfun_arrow_path t ;
+    fillup arrowhead reverse mfun_arrow_path t ;
+    endgroup ;
+enddef ;
+
+% The picture variant is not treating each path but only the first and
+% last path. This can be somewhat counterintuitive but is needed for Alan's
+% macros. So here the last and in case of a double path first paths in a
+% picture get the shortening.
+
+def mfun_with_arrow_picture (text t) =
+    mfun_arrow_count := 0 ;
+    mfun_arrow_snippets := stroked_paths(mfun_arrow_picture) ;
+    for i within mfun_arrow_picture :
+        if istextext(i) :
+            draw i
+        else :
+            mfun_arrow_count := mfun_arrow_count + 1 ;
+            mfun_arrow_path := pathpart i ;
+            t
+        fi ;
+    endfor ;
+enddef ;
+
+def mfun_draw_arrow_picture text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    mfun_with_arrow_picture (
+        if mfun_arrow_count = mfun_arrow_snippets :
+            draw arrowpath mfun_arrow_path mfun_decoration_i i t ;
+            fillup arrowhead mfun_arrow_path mfun_decoration_i i t ;
+        else :
+            draw mfun_arrow_path mfun_decoration_i i t ;
+        fi ;
+    )
+    endgroup ;
+enddef ;
+
+def mfun_draw_arrow_picture_double text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    mfun_with_arrow_picture (
+        draw
+        if mfun_arrow_count = 1 :
+            arrowpath reverse
+        elseif mfun_arrow_count = mfun_arrow_snippets :
+            arrowpath
+        fi
+        mfun_arrow_path mfun_decoration_i i t ;
+        if mfun_arrow_count = 1 :
+            fillup arrowhead reverse mfun_arrow_path mfun_decoration_i i t ;
+        fi
+        if mfun_arrow_count = mfun_arrow_snippets :
+            fillup arrowhead mfun_arrow_path mfun_decoration_i i t ;
+        fi
+    )
+    endgroup ;
+enddef ;
+
+%D Some more arrow magic, by Alan:
+
+let drawdoublearrow = drawdblarrow ;
+
+def drawdoublearrows expr p =
+    begingroup ;
+    save mfun_arrow_path ;
+    path mfun_arrow_path ;
+    save mfun_arrow_path_parallel ;
+    path mfun_arrow_path_parallel ;
+    if path p :
+        mfun_arrow_path := p ;
+        expandafter mfun_draw_arrow_paths
+    elseif picture p :
+        save mfun_arrow_picture ;
+        picture mfun_arrow_picture ;
+        mfun_arrow_picture := p ;
+        expandafter mfun_draw_arrow_pictures
+    else :
+        expandafter mfun_draw_arrow_nothing
+    fi
+enddef ;
+
+def mfun_draw_arrow_paths text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    save d ; d := ahscale*ahlength*sind(ahangle/2) ;
+    mfun_arrow_path_parallel := mfun_arrow_path paralleled d ;
+    draw   arrowpath mfun_arrow_path_parallel t ;
+    fillup arrowhead mfun_arrow_path_parallel t ;
+    mfun_arrow_path_parallel := (reverse mfun_arrow_path) paralleled d ;
+    draw   arrowpath mfun_arrow_path_parallel t ;
+    fillup arrowhead mfun_arrow_path_parallel t ;
+    endgroup ;
+enddef ;
+
+def mfun_draw_arrow_pictures text t =
+    if autoarrows :
+        set_ahlength(t) ;
+    fi
+    save d ; d := ahscale*ahlength*sind(ahangle/2) ;
+    mfun_with_arrow_picture(
+        if mfun_arrow_count = 1 :
+            draw (mfun_arrow_path  paralleled d)          mfun_decoration_i i t ;
+            mfun_arrow_path_parallel := (reverse mfun_arrow_path) paralleled d ;
+            draw   arrowpath mfun_arrow_path_parallel     mfun_decoration_i i t ;
+            fillup arrowhead mfun_arrow_path_parallel     mfun_decoration_i i t ;
+        elseif mfun_arrow_count = mfun_arrow_snippets :
+            draw ((reverse mfun_arrow_path) paralleled d) mfun_decoration_i i t ;
+            mfun_arrow_path_parallel := mfun_arrow_path paralleled d ;
+            draw   arrowpath mfun_arrow_path_parallel     mfun_decoration_i i t ;
+            fillup arrowhead mfun_arrow_path_parallel     mfun_decoration_i i t ;
+        else :
+            draw (         mfun_arrow_path  paralleled d) mfun_decoration_i i t ;
+            draw ((reverse mfun_arrow_path) paralleled d) mfun_decoration_i i t ;
+        fi
+    )
+    endgroup ;
+enddef ;
+
+%D Handy too ......
+
+vardef pointarrow (expr pat, loc, len, off) =
+    save l, r, s, t ; path l, r ; numeric s ; pair t ;
+    t := if pair loc : loc else : point loc along pat fi ;
+    s := len/2 - off ; if s<=0 : s := 0 elseif s>len : s := len fi ;
+    r := pat cutbefore t ;
+    r := (r cutafter point (arctime s of r) of r) ;
+    s := len/2 + off ; if s<=0 : s := 0 elseif s>len : s := len fi ;
+    l := reverse (pat cutafter t) ;
+    l := (reverse (l cutafter point (arctime s of l) of l)) ;
+    (l..r)
+enddef ;
+
+def rightarrow  (expr pat,tim,len) = pointarrow(pat,tim,len,-len) enddef ;
+def leftarrow   (expr pat,tim,len) = pointarrow(pat,tim,len,+len) enddef ;
+def centerarrow (expr pat,tim,len) = pointarrow(pat,tim,len,   0) enddef ;
+
+permanent drawarrow, drawdblarrow, drawdoublearrows, drawdoublearrow, pointarrow, rightarrow, leftarrow, centerarrow ;
+
+%D The \type {along} and \type {on} operators can be used as follows:
+%D
+%D \starttyping
+%D drawdot point .5  along somepath ;
+%D drawdot point 3cm on    somepath ;
+%D \stoptyping
+%D
+%D The number denotes a percentage (fraction).
+
+primarydef pct along pat = % also negative
+    (arctime (pct * (arclength pat)) of pat) of pat
+enddef ;
+
+primarydef len on pat = % no outer ( ) .. somehow fails
+    (arctime if len>=0 : len else : (arclength(pat)+len) fi of pat) of pat
+enddef ;
+
+% this cuts of a piece from both ends
+
+tertiarydef pat cutends len =
+    begingroup
+    save tap ; path tap ;
+    tap := pat cutbefore (point (xpart paired(len)) on pat) ;
+    (tap cutafter (point -(ypart paired(len)) on tap))
+    endgroup
+enddef ;
+
+permanent along, on, cutends ;
+
+%D To be documented.
+
+path freesquare ; freesquare := (
+    (-1,0) -- (-1,-1) -- (0,-1) -- (+1,-1) --
+    (+1,0) -- (+1,+1) -- (0,+1) -- (-1,+1) -- cycle
+) scaled .5 ;
+
+numeric freelabeloffset  ; freelabeloffset  := 3pt ;
+numeric freedotlabelsize ; freedotlabelsize := 3pt ;
+
+vardef thefreelabel (expr asked_text, asked_location, asked_origin) =
+    save s, p, q, l ; picture s ; path p, q ; pair l ;
+    interim labeloffset := freelabeloffset ;
+    s := if string asked_text : thelabel(asked_text,asked_location) else : asked_text shifted -center asked_text shifted asked_location fi ;
+    setbounds s to boundingbox s enlarged freelabeloffset ;
+    p := fullcircle scaled (2*length(asked_location-asked_origin)) shifted asked_origin ;
+    q := freesquare xyscaled (urcorner s - llcorner s) ;
+    l := point xpart (p intersectiontimes (asked_origin--asked_location shifted (asked_location-asked_origin))) of q ;
+    setbounds s to boundingbox s enlarged -freelabeloffset ; % new
+  % draw boundingbox s shifted -l withpen pencircle scaled .5pt withcolor red ;
+    (s shifted -l)
+enddef ;
+
+vardef freelabel (expr asked_text, asked_location, asked_origin) =
+    draw thefreelabel(asked_text,asked_location,asked_origin) ;
+enddef ;
+
+vardef freedotlabel (expr asked_text, loc, asked_origin) =
+    interim linecap := rounded ;
+    draw asked_location withpen pencircle scaled freedotlabelsize ;
+    draw thefreelabel(asked_text,asked_location,asked_origin) ;
+enddef ;
+
+immutable freesquare ;
+permanent freelabeloffset, freedotlabelsize, thefreelabel, freelabel, freedotlabel ;
+
+%D \starttyping
+%D drawarrow anglebetween(line_a,line_b,somelabel) ;
+%D \stoptyping
+
+newinternal angleoffset ; angleoffset :=  0pt ;
+newinternal anglelength ; anglelength := 20pt ;
+newinternal anglemethod ; anglemethod :=    1 ;
+
+vardef anglebetween (expr a, b, s) = % path path string
+    save pointa, pointb, common, middle, offset ;
+    pair pointa, pointb, common, middle, offset ;
+    save curve ; path curve ;
+    save where ; numeric where ;
+    if round point 0 of a = round point 0 of b :
+        common := point 0 of a ;
+    else :
+        common := a intersectionpoint b ;
+    fi ;
+    pointa := point anglelength on a ;
+    pointb := point anglelength on b ;
+    where  := turningnumber (common--pointa--pointb--cycle) ;
+    middle := (reverse(common--pointa) rotatedaround (pointa,-where*90))
+        intersection_point
+        (reverse(common--pointb) rotatedaround (pointb, where*90)) ;
+    if not intersection_found :
+        middle := point .5 along
+        ((reverse(common--pointa) rotatedaround (pointa,-where*90)) --
+        (       (common--pointb) rotatedaround (pointb, where*90))) ;
+    fi ;
+    if     anglemethod = 0 :
+        curve  := pointa{unitvector(middle-pointa)}.. pointb;
+        middle := point .5 along curve ;
+        curve  := common ;
+    elseif anglemethod = 1 :
+        curve  := pointa{unitvector(middle-pointa)}.. pointb;
+        middle := point .5 along curve ;
+    elseif anglemethod = 2 :
+        middle := common rotatedaround(.5[pointa,pointb],180) ;
+        curve  := pointa--middle--pointb ;
+    elseif anglemethod = 3 :
+        curve  := pointa--middle--pointb ;
+    elseif anglemethod = 4 :
+        curve  := pointa..controls middle..pointb ;
+        middle := point .5 along curve ;
+    fi ;
+    draw thefreelabel(s, middle, common) ; % withcolor black ;
+    curve
+enddef ;
+
+permanent anglebetween, angleoffset, anglelength, anglemethod ;
+
+% Stack
+
+picture mfun_current_picture_stack[] ;
+numeric mfun_current_picture_depth   ;
+
+mfun_current_picture_depth := 0 ;
+
+def pushcurrentpicture =
+    mfun_current_picture_depth := mfun_current_picture_depth + 1 ;
+    mfun_current_picture_stack[mfun_current_picture_depth] := currentpicture ;
+    currentpicture := nullpicture ;
+enddef ;
+
+def popcurrentpicture text t = % optional text
+    if mfun_current_picture_depth > 0 :
+        addto mfun_current_picture_stack[mfun_current_picture_depth] also currentpicture t ;
+        currentpicture := mfun_current_picture_stack[mfun_current_picture_depth] ;
+        mfun_current_picture_stack[mfun_current_picture_depth] := nullpicture ;
+        mfun_current_picture_depth := mfun_current_picture_depth - 1 ;
+    fi ;
+enddef ;
+
+permanent pushcurrentpicture, popcurrentpicture ;
+
+% penpoint (i,2) of somepath -> inner / outer point
+
+vardef penpoint expr pnt of p =
+    save n, d ; numeric n, d ;
+    (n,d) = if pair pnt : pnt else : (pnt,1) fi ;
+    (point n of p shifted ((penoffset direction n of p of currentpen) scaled d))
+enddef ;
+
+permanent penpoint ;
+
+%D colorcircle(size, red, green, blue) ;
+
+vardef colorcircle (expr size, red, green, blue) = % might move
+    save r, g, b, c, m, y, w ; save radius ;
+    path r, g, b, c, m, y, w ; numeric radius ;
+
+    radius := 5cm ; pickup pencircle scaled (radius/25) ;
+
+    transform t ; t := identity rotatedaround(origin,120) ;
+
+    r := fullcircle rotated 90 scaled radius shifted (0,radius/4) rotatedaround(origin,135) ;
+
+    b := r transformed t ; g := b transformed t ;
+
+    c := buildcycle(subpath(1,7) of g,subpath(1,7) of b) ;
+    y := c transformed t ; m := y transformed t ;
+
+    w := buildcycle(subpath(3,5) of r, subpath(3,5) of g,subpath(3,5) of b) ;
+
+    pushcurrentpicture ;
+
+    fill r withcolor         red   ;
+    fill g withcolor         green ;
+    fill b withcolor         blue  ;
+    fill c withcolor white - red   ;
+    fill m withcolor white - green ;
+    fill y withcolor white - blue  ;
+    fill w withcolor white         ;
+
+    for i = r,g,b,c,m,y : draw i withcolor .5white ; endfor ;
+
+    currentpicture := currentpicture xsized size ;
+
+    popcurrentpicture ;
+enddef ;
+
+% nice: currentpicture := inverted currentpicture ;
+
+primarydef p uncolored c = % not complete ... needs text and scripts and ...
+    if color p :
+        c - p
+    else :
+        image (
+            for i within p :
+                addto currentpicture
+                    if stroked i or filled i :
+                        if filled i :
+                            contour
+                        else :
+                            doublepath
+                        fi
+                        pathpart i
+                        dashed dashpart i withpen penpart i
+                    else :
+                        also i
+                    fi
+                    withcolor c-(redpart i, greenpart i, bluepart i) ;
+            endfor ;
+        )
+  fi
+enddef ;
+
+vardef inverted primary p =
+    p uncolored white
+enddef ;
+
+primarydef p softened c =
+    begingroup
+    save cc ; color cc ; cc := tripled(c) ;
+    if color p :
+        (redpart cc * redpart p,greenpart cc * greenpart p, bluepart cc * bluepart p)
+    else :
+        image (
+            for i within p :
+                addto currentpicture
+                    if stroked i or filled i :
+                        if filled i :
+                            contour
+                        else :
+                            doublepath
+                        fi
+                        pathpart i
+                        dashed dashpart i withpen penpart i
+                    else :
+                        also i
+                    fi
+                    withcolor (redpart cc * redpart i, greenpart cc * greenpart i, bluepart cc * bluepart i) ;
+            endfor ;
+        )
+    fi
+    endgroup
+enddef ;
+
+vardef grayed primary p =
+    if rgbcolor p :
+        tripled(.30redpart p+.59greenpart p+.11bluepart p)
+    elseif cmykcolor p :
+        tripled(.30*(1-cyanpart i)+.59*(1-magentapart i)+.11*(1-yellowpart i)+blackpart i)
+    elseif greycolor p :
+        p
+    elseif string p :
+        grayed resolvedcolor(p)
+    elseif picture p :
+        image (
+            for i within p :
+                addto currentpicture
+                    if stroked i or filled i :
+                        if filled i :
+                            contour
+                        else :
+                            doublepath
+                        fi
+                        pathpart i
+                        dashed dashpart i
+                        withpen penpart i
+                    else :
+                        also i
+                    fi
+                if unknown colorpart i :
+                    % nothing
+                elseif rgbcolor colorpart i :
+                    withcolor tripled(.30redpart i+.59greenpart i+.11bluepart i) ;
+                elseif cmykcolor colorpart i :
+                    withcolor tripled(.30*(1-cyanpart i)+.59*(1-magentapart i)+.11*(1-yellowpart i)+blackpart i) ;
+                else :
+                    withcolor colorpart i ;
+                fi
+            endfor ;
+        )
+    else :
+        p
+    fi
+enddef ;
+
+let greyed = grayed ;
+
+vardef hsvtorgb(expr h,s,v) =
+    save H, S, V, x ;
+    H = h mod 360 ;
+    S = if s < 0 : 0 elseif s > 1 : 1 else: s fi ;
+    V = if v < 0 : 0 elseif v > 1 : 1 else: v fi ;
+    x = 1 - abs(H mod 120 - 60)/60 ;
+    V * ( (1-S) * (1,1,1) + S *
+        if     H <  60 : (1,x,0)
+        elseif H < 120 : (x,1,0)
+        elseif H < 180 : (0,1,x)
+        elseif H < 240 : (0,x,1)
+        elseif H < 300 : (x,0,1)
+        else           : (1,0,x)
+    fi )
+enddef ;
+
+permanent colorcircle, uncolored, inverted, grayed, greyed, hsvtorgb ;
+
+% yes or no: "text" infont "cmr12" at 24pt ;
+
+% let normalinfont = infont ;
+%
+% numeric lastfontsize ; lastfontsize = fontsize defaultfont ;
+%
+% def infont primary name =  % no vardef, no expr
+%   hide(lastfontsize := fontsize name) % no ;
+%   normalinfont name
+% enddef ;
+%
+% def scaledat expr size =
+%   scaled (size/lastfontsize)
+% enddef ;
+%
+% let at = scaledat ;
+
+% like decimal
+
+def condition primary b = if b : "true" else : "false" fi enddef ;
+
+permanent condition ;
+
+% undocumented
+
+primarydef p stretched s =
+    begingroup
+    save pp ; path pp ; pp := p xyscaled s ;
+    (pp shifted ((point 0 of p) - (point 0 of pp)))
+    endgroup
+enddef ;
+
+primarydef p enlonged len =
+    begingroup
+    if len == 0 :
+        p
+    elseif pair p :
+        save q ; path q ; q := origin -- p ;
+        save al ; al := arclength(q) ;
+        if al > 0 :
+            point 1 of (q stretched ((al+len)/al))
+        else :
+            p
+        fi
+    else :
+        save al ; al := arclength(p) ;
+        if al > 0 :
+            p stretched ((al+len)/al)
+        else :
+            p
+        fi
+    fi
+    endgroup
+enddef ;
+
+% path p ; p := (0,0) -- (10cm,5cm) ;
+% drawarrow p withcolor red ;
+% drawarrow p shortened 1cm withcolor green ;
+
+% primarydef p shortened d =
+%     reverse ( ( reverse (p enlonged -d) ) enlonged -d )
+% enddef ;
+
+primarydef p shortened d =
+    reverse ( ( reverse (p enlonged -xpart paired(d)) ) enlonged -ypart paired(d) )
+enddef ;
+
+% yes or no, untested -)
+
+def xshifted expr dx = shifted(dx,0) enddef ;
+def yshifted expr dy = shifted(0,dy) enddef ;
+
+
+permanent stretched, enlonged, shortened, xshifted, yshifted ;
+
+% also handy
+
+% right: str = readfrom ("abc" & ".def" ) ;
+% wrong: str = readfrom  "abc" & ".def"   ;
+
+% Every 62th read fails so we need to try again!
+
+% def readfile (expr name) =
+%   if (readfrom (name) <> EOF) :
+%     scantokens("input " & name & ";") ;
+%   elseif (readfrom (name) <> EOF) :
+%     scantokens("input " & name & ";") ;
+%   fi ;
+%   closefrom (name) ;
+% enddef ;
+%
+% this sometimes fails on the elseif, so :
+%
+
+def readfile (expr name) =
+    begingroup ; save ok ; boolean ok ;
+    if (readfrom (name) <> EOF) :
+        ok := false ;
+    elseif (readfrom (name) <> EOF) :
+        ok := false ;
+    else :
+        ok := true ;
+    fi ;
+    if not ok :
+        scantokens("input " & name & " ") ;
+    fi ;
+    closefrom (name) ;
+    endgroup ;
+enddef ;
+
+permanent readfile ; % todo: lmtx
+
+% permits redefinition of end in macro
+
+inner end ;
+
+% this will be redone (when needed) using scripts and backend handling
+
+let mfun_remap_colors_normalwithcolor = normalwithcolor ;
+
+def remapcolors =
+    def normalwithcolor primary c =
+        mfun_remap_colors_normalwithcolor remappedcolor(c)
+    enddef ;
+enddef ;
+
+def normalcolors =
+    let normalwithcolor = mfun_remap_colors_normalwithcolor ;
+enddef ;
+
+def resetcolormap =
+    color color_map[][][] ;
+    normalcolors ;
+enddef ;
+
+resetcolormap ;
+
+def r_color primary c = redpart   c enddef ; % still neeeded?
+def g_color primary c = greenpart c enddef ; % still neeeded?
+def b_color primary c = bluepart  c enddef ; % still neeeded?
+
+def remapcolor(expr old, new) =
+    color_map[redpart old][greenpart old][bluepart old] := new ;
+enddef ;
+
+def remappedcolor(expr c) =
+    if known color_map[redpart c][greenpart c][bluepart c] :
+        color_map[redpart c][greenpart c][bluepart c]
+    else :
+        c
+    fi
+enddef ;
+
+% Thanks to Jens-Uwe Morawski for pointing out that we need
+% to treat bounded and clipped components as local pictures.
+
+def recolor suffix p = p := mfun_repathed (0,p) enddef ;
+def refill  suffix p = p := mfun_repathed (1,p) enddef ;
+def redraw  suffix p = p := mfun_repathed (2,p) enddef ;
+def retext  suffix p = p := mfun_repathed (3,p) enddef ;
+def untext  suffix p = p := mfun_repathed (4,p) enddef ;
+
+% primarydef p recolored t = mfun_repathed(0,p) t enddef ;
+% primarydef p refilled  t = mfun_repathed(1,p) t enddef ;
+% primarydef p redrawn   t = mfun_repathed(2,p) t enddef ;
+% primarydef p retexted  t = mfun_repathed(3,p) t enddef ;
+% primarydef p untexted  t = mfun_repathed(4,p) t enddef ;
+
+color refillbackground ; refillbackground := (1,1,1) ;
+
+def restroke  suffix p = p := mfun_repathed (21,p) enddef ; % keep attributes
+def reprocess suffix p = p := mfun_repathed (22,p) enddef ; % no attributes
+
+permanent recolor, refill, redraw, retext, untext, restroke, reprocess, refillbackground ;
+
+% also 11 and 12
+
+vardef mfun_repathed (expr mode, p) text t =
+    begingroup ;
+    if mode = 0 :
+        save normalwithcolor ;
+        remapcolors ;
+    fi ;
+    save temp_p, temp_q, temp_r, temp_f, temp_b ;
+    picture temp_p, temp_q, temp_r ; color temp_f ; path temp_b ;
+    temp_b := boundingbox p ;
+    temp_p := nullpicture ;
+    for i within p :
+        temp_f := (redpart i, greenpart i, bluepart i) ;
+        if bounded i :
+            temp_q := mfun_repathed(mode,i) t ;
+            setbounds temp_q to pathpart i ;
+            addto temp_p also temp_q ;
+        elseif clipped i :
+            temp_q := mfun_repathed(mode,i) t ;
+            clip temp_q to pathpart i ;
+            addto temp_p also temp_q ;
+        elseif stroked i :
+            if mode=21 :
+                temp_r := i ; % indirectness is needed
+                addto temp_p also image(scantokens(t & " pathpart temp_r")
+                    dashed dashpart i withpen penpart i
+                    withcolor temp_f ; ) ;
+            elseif mode=22 :
+                temp_r := i ; % indirectness is needed
+                addto temp_p also image(scantokens(t & " pathpart temp_r")) ;
+            else :
+                addto temp_p doublepath pathpart i
+                    dashed dashpart i withpen penpart i
+                    withcolor temp_f % (redpart i, greenpart i, bluepart i)
+                    if mode = 2 :
+                        t
+                    fi ;
+            fi ;
+        elseif filled  i :
+            if mode=11 :
+                temp_r := i ; % indirectness is needed
+                addto temp_p also image(scantokens(t & " pathpart temp_r")
+                    withcolor temp_f ; ) ;
+            elseif mode=12 :
+                temp_r := i ; % indirectness is needed
+                addto temp_p also image(scantokens(t & " pathpart temp_r")) ;
+            else :
+                addto temp_p contour pathpart i
+                    withcolor temp_f
+                    if (mode=1) and (temp_f<>refillbackground) :
+                        t
+                    fi ;
+            fi ;
+        else :
+            addto temp_p also i ;
+        fi ;
+    endfor ;
+    setbounds temp_p to temp_b ;
+    temp_p
+    endgroup
+enddef ;
+
+% After a question of Denis on how to erase a z variable, Jacko
+% suggested to assign whatever to x and y. So a clearz
+% variable can be defined as:
+%
+% vardef clearz@# =
+%   x@# := whatever ;
+%   y@# := whatever ;
+% enddef ;
+%
+% but Jacko suggested a redefinition of clearxy:
+%
+% def clearxy text s =
+%  clearxy_index_:=0;
+%  for $:=s:
+%    clearxy_index_:=clearxy_index_+1; endfor;
+%  if clearxy_index_=0:
+%    save x,y;
+%  else:
+%    forsuffixes $:=s: x$:=whatever; y$:=whatever; endfor;
+%  fi
+% enddef;
+%
+% which i decided to simplify to:
+
+def clearxy text s =
+    if false for $ := s : or true endfor :
+        forsuffixes $ := s : x$ := whatever ; y$ := whatever ; endfor ;
+    else :
+        save x, y ;
+    fi
+enddef ;
+
+permanent clearxy ;
+
+% so now we can say: clearxy ; as well as clearxy 1, 2, 3 ;
+
+% show x0 ; z0 = (10,10) ;
+% show x0 ; x0 := whatever ; y0 := whatever ;
+% show x0 ; z0 = (20,20) ;
+% show x0 ; clearxy 0 ;
+% show x0 ; z0 = (30,30) ;
+
+primarydef p smoothed d =
+   (p llmoved (-xpart paired(d),0) -- p lrmoved (-xpart paired(d),0) {right} ..
+    p lrmoved (0,-ypart paired(d)) -- p urmoved (0,-ypart paired(d)) {up}    ..
+    p urmoved (-xpart paired(d),0) -- p ulmoved (-xpart paired(d),0) {left}  ..
+    p ulmoved (0,-ypart paired(d)) -- p llmoved (0,-ypart paired(d)) {down}  .. cycle)
+enddef ;
+
+primarydef p cornered c =
+    ((point 0 of p) shifted (c*(unitvector(point 1 of p - point 0 of p))) --
+    for i=1 upto length(p) :
+        (point i-1 of p) shifted (c*(unitvector(point i   of p - point i-1 of p))) --
+        (point i   of p) shifted (c*(unitvector(point i-1 of p - point i   of p))) ..
+        controls point i of p ..
+    endfor cycle)
+enddef ;
+
+permanent smoothed, cornered ;
+
+% cmyk color support
+
+% vardef cmyk(expr c,m,y,k) = % elsewhere
+%     (1-c-k,1-m-k,1-y-k)
+% enddef ;
+
+% handy
+
+% vardef bbwidth (expr p) = % vardef width_of primary p =
+%     if known p :
+%         if path p or picture p :
+%             xpart (lrcorner p - llcorner p)
+%         else :
+%             0
+%         fi
+%     else :
+%         0
+%     fi
+% enddef ;
+
+vardef bbwidth primary p =
+    if unknown p :
+        0
+    elseif path p or picture p :
+        xpart (lrcorner p - llcorner p)
+    else :
+        0
+    fi
+enddef ;
+
+% vardef bbheight (expr p) = % vardef heigth_of primary p =
+%     if known p :
+%         if path p or picture p :
+%             ypart (urcorner p - lrcorner p)
+%         else :
+%             0
+%         fi
+%     else :
+%         0
+%     fi
+% enddef ;
+
+vardef bbheight primary p =
+    if unknown p :
+        0
+    elseif path p or picture p :
+        ypart (urcorner p - lrcorner p)
+    else :
+        0
+    fi
+enddef ;
+
+permanent bbwidth, bbheight ;
+
+color nocolor ; numeric noline ; % both unknown signals
+
+def dowithpath (expr p, lw, lc, bc) =
+    if known p :
+        if known bc :
+            fill p withcolor bc ;
+        fi ;
+        if known lw and known lc :
+            draw p withpen pencircle scaled lw withcolor lc ;
+        elseif known lw :
+            draw p withpen pencircle scaled lw ;
+        elseif known lc :
+            draw p withcolor lc ;
+        fi ;
+    fi ;
+enddef ;
+
+% result from metafont discussion list (denisr/boguslawj)
+
+def [[[ = [ [ [ enddef ; % already: def [[ = [ [ enddef ;
+def ]]] = ] ] ] enddef ; % already: def ]] = ] ] enddef ;
+
+let == = = ; % magic
+
+permanent [[[, ]]], ==;
+
+% added
+
+picture oddly ; % evenly already defined
+
+evenly := dashpattern(on  3 off 3) ;
+oddly  := dashpattern(off 3 on  3) ;
+
+% not perfect, but useful since it removes redundant points.
+
+vardef mfun_straightened(expr sign, p) =
+    save temp_p, temp_q ; path temp_p, temp_q ;
+    temp_p := p ;
+    forever :
+        temp_q := mfun_do_straightened(sign, temp_p) ;
+        exitif length(temp_p) = length(temp_q) ;
+        temp_p := temp_q ;
+    endfor ;
+    temp_q
+enddef ;
+
+% vardef mfun_straightened(expr sign, p) =
+%     save lp, lq, q ; path q ; q := p ;
+%     lp := length(p) ;
+%     forever :
+%         q := mfun_do_straightened(sign,q) ;
+%         lq := length(q) ;
+%         exitif lp = lq ;
+%         lp := lq ;
+%     endfor ;
+%     q
+% enddef ;
+
+% can be optimized:
+
+vardef mfun_do_straightened(expr sign, p) =
+    if length(p) > 2 : % was 1, but straight lines are ok
+        save pp ; path pp ;
+        pp := point 0 of p ;
+        for i=1 upto length(p)-1 :
+            if round(point i of p) <> round(point length(pp) of pp) :
+                pp := pp -- point i of p ;
+            fi ;
+        endfor ;
+        save n, ok ; numeric n ; boolean ok ;
+        n := length(pp) ; ok := false ;
+        if n > 2 :
+            for i=0 upto n :
+                if unitvector(round(point i of pp - point if i=0 : n else : i-1 fi of pp)) <>
+            sign * unitvector(round(point if i=n : 0 else : i+1 fi of pp - point i of pp)) :
+                    if ok :
+                        --
+                    else :
+                        ok := true ;
+                    fi point i of pp
+                fi
+            endfor
+            if ok and (cycle p) :
+                -- cycle
+            fi
+        else :
+            pp
+        fi
+    else :
+        p
+    fi
+enddef ;
+
+vardef simplified expr p = (
+    reverse mfun_straightened(+1,mfun_straightened(+1,reverse p))
+) enddef ;
+
+vardef unspiked expr p = (
+    reverse mfun_straightened(-1,mfun_straightened(-1,reverse p))
+) enddef ;
+
+permanent simplified, unspiked ;
+
+% path p ;
+% p := (2cm,1cm) -- (2cm,1cm) -- (2cm,1cm) -- (3cm,1cm) --
+%      (4cm,1cm) -- (4cm,2cm) -- (4cm,2.5cm) -- (4cm,3cm) --
+%      (3cm,3cm) -- (2cm,3cm) -- (1cm,3cm) -- (-1cm,3cm) --
+%      .5[(-1cm,3cm),(1cm,1cm)] -- (1cm,1cm) -- cycle ;
+%
+% p := unitcircle scaled 4cm ;
+%
+% drawpath p ; drawpoints p ; drawpointlabels p ;
+% p := p shifted (4cm,0) ; p := straightened p ;
+% drawpath p ; drawpoints p ; drawpointlabels p ;
+% p := p shifted (4cm,0) ; p := straightened p ;
+% drawpath p ; drawpoints p ; drawpointlabels p ;
+
+% new
+
+path originpath ; originpath := origin -- cycle ;
+
+vardef unitvector primary z =
+    if abs z = abs origin : z else : z/abs z fi % hm, abs origin is just origin
+enddef;
+
+vardef epsed (expr e) = % epsed(1.2345)
+    e if e>0 : + eps elseif e < 0 : - eps fi
+enddef ;
+
+immutable originpath ;
+permanent unitvector, epsed ;
+
+% handy
+
+def withgray primary g =
+    withcolor g
+enddef ;
+
+if unknown darkred     : color darkred     ; darkred     := .625(1,0,0) fi ;
+if unknown darkgreen   : color darkgreen   ; darkgreen   := .625(0,1,0) fi ;
+if unknown darkblue    : color darkblue    ; darkblue    := .625(0,0,1) fi ;
+if unknown darkcyan    : color darkcyan    ; darkcyan    := .625(0,1,1) fi ;
+if unknown darkmagenta : color darkmagenta ; darkmagenta := .625(1,0,1) fi ;
+if unknown darkyellow  : color darkyellow  ; darkyellow  := .625(1,1,0) fi ;
+if unknown darkgray    : color darkgray    ; darkgray    := .625(1,1,1) fi ;
+if unknown lightgray   : color lightgray   ; lightgray   := .850(1,1,1) fi ;
+
+permanent withgray ;
+
+% an improved plain mp macro
+
+vardef center primary p =
+    if pair p :
+        p
+    else :
+        .5[llcorner p, urcorner p]
+    fi
+enddef;
+
+permanent center ;
+
+% new, yet undocumented
+
+vardef rangepath (expr p, d, a) =
+    if length p>0 :
+        (d*unitvector(direction 0 of p) rotated a) shifted point 0 of p
+        -- p --
+        (d*unitvector(direction length(p) of p) rotated a) shifted point length(p) of p
+    else :
+        p
+    fi
+enddef ;
+
+% under construction
+
+vardef straightpath (expr a, b, method) =
+    if (method<1) or (method>6)  :
+        (a--b)
+    elseif method = 1 :
+        (a --
+            if xpart a > xpart b :
+                if ypart a > ypart b :
+                    (xpart b,ypart a) --
+                elseif ypart a < ypart b :
+                    (xpart a,ypart b) --
+                fi
+            elseif xpart a < xpart b :
+                if ypart a > ypart b :
+                    (xpart a,ypart b) --
+                elseif ypart a < ypart b :
+                    (xpart b,ypart a) --
+                fi
+            fi
+        b)
+    elseif method = 3 :
+        (a --
+            if xpart a > xpart b :
+                (xpart b,ypart a) --
+            elseif xpart a < xpart b :
+                (xpart a,ypart b) --
+            fi
+        b)
+    elseif method = 5 :
+        (a --
+            if ypart a > ypart b :
+                (xpart b,ypart a) --
+            elseif ypart a < ypart b :
+                (xpart a,ypart b) --
+            fi
+        b)
+    else :
+        (reverse straightpath(b,a,method-1))
+    fi
+enddef ;
+
+permanent straightpath ;
+
+% handy for myself
+
+def addbackground text t =
+    begingroup ;
+    save p, b ; picture p ; path b ;
+    b := boundingbox currentpicture ;
+    p := currentpicture ; currentpicture := nullpicture ;
+    fill b t ;
+    setbounds currentpicture to b ;
+    addto currentpicture also p ;
+    endgroup ;
+enddef ;
+
+permanent addbackground ;
+
+% makes a (line) into an infinite one (handy for calculating
+% intersection points
+
+vardef infinite expr p =
+    (-infinity*unitvector(direction 0 of p)
+    shifted point 0 of p
+    -- p --
+    +infinity*unitvector(direction length(p) of p)
+        shifted point length(p) of p)
+enddef ;
+
+permanent infinite ;
+
+% obscure macros: create var from string and replace - and :
+% (needed for process color id's) .. will go away
+
+% this will become a lua helper
+
+% string mfun_clean_ascii[] ;
+%
+% def register_dirty_chars(expr str) =
+%     for i = 0 upto length(str)-1 :
+%         mfun_clean_ascii[ASCII substring(i,i+1) of str] := "_" ;
+%     endfor ;
+% enddef ;
+%
+% register_dirty_chars("+-*/:;., ") ;
+%
+% vardef cleanstring (expr s) =
+%     save ss ; string ss, si ; ss = "" ; save i ;
+%     for i=0 upto length(s) :
+%         si := substring(i,i+1) of s ;
+%         ss := ss & if known mfun_clean_ascii[ASCII si] : mfun_clean_ascii[ASCII si] else : si fi ;
+%     endfor ;
+%     ss
+% enddef ;
+%
+% vardef asciistring (expr s) =
+%     save ss ; string ss, si ; ss = "" ; save i ;
+%     for i=0 upto length(s) :
+%         si := substring(i,i+1) of s ;
+%         if (ASCII si >= ASCII "0") and (ASCII si <= ASCII "9") :
+%             ss := ss & char(scantokens(si) + ASCII "A") ;
+%         else :
+%             ss := ss & si ;
+%         fi ;
+%     endfor ;
+%     ss
+% enddef ;
+%
+% vardef setunstringed (expr s, v) =
+%     scantokens(cleanstring(s)) := v ;
+% enddef ;
+%
+% vardef getunstringed (expr s) =
+%     scantokens(cleanstring(s))
+% enddef ;
+%
+% vardef unstringed (expr s) =
+%     expandafter known scantokens(cleanstring(s))
+% enddef ;
+
+% for david arnold: showgrid(-5,10,1cm,-10,10,1cm);
+
+def showgrid (expr minx, maxx, deltax, miny, maxy, deltay) = % will move
+    begingroup
+    save size ; numeric size ; size := 2pt ;
+    for x=minx upto maxx :
+        for y=miny upto maxy :
+            draw (x*deltax, y*deltay) withpen pencircle scaled
+                if (x mod 5 = 0) and (y mod 5 = 0) :
+                    1.5size withcolor .50white
+                else :
+                       size withcolor .75white
+                fi ;
+        endfor ;
+    endfor ;
+    for x=minx upto maxx:
+        label.bot(textext("\infofont " & decimal x), (x*deltax,-size)) ;
+    endfor ;
+    for y=miny upto maxy:
+        label.lft(textext("\infofont " & decimal y), (-size,y*deltay)) ;
+    endfor ;
+    endgroup
+enddef;
+
+% new, handy for:
+%
+% \startuseMPgraphic{map}{n}
+%   \includeMPgraphic{map:germany} ;
+%   c_phantom (\MPvar{n}<1) (
+%     fill map_germany withcolor \MPcolor{lightgray} ;
+%     draw map_germany withpen pencircle scaled 1pt withcolor \MPcolor{darkgray} ;
+%   ) ;
+%   \includeMPgraphic{map:austria} ;
+%   c_phantom (\MPvar{n}<2) (
+%     fill map_austria withcolor \MPcolor{lightgray} ;
+%     draw map_austria withpen pencircle scaled 1pt withcolor \MPcolor{darkgray} ;
+%   ) ;
+%   c_phantom (\MPvar{n}<3) (
+%   \includeMPgraphic{map:swiss} ;
+%     fill map_swiss withcolor \MPcolor{lightgray} ;
+%     draw map_swiss withpen pencircle scaled 1pt withcolor \MPcolor{darkgray}  ;
+%   ) ;
+%   c_phantom (\MPvar{n}<4) (
+%   \includeMPgraphic{map:luxembourg} ;
+%     fill map_luxembourg withcolor \MPcolor{lightgray} ;
+%     draw map_luxembourg withpen pencircle scaled 1pt withcolor \MPcolor{darkgray}  ;
+%   ) ;
+% \stopuseMPgraphic
+%
+% \useMPgraphic{map}{n=3}
+
+vardef phantom (text t) = % to be checked
+    picture temp_p ;
+    temp_p := image(t) ;
+    addto temp_p also currentpicture ;
+    setbounds currentpicture to boundingbox temp_p ;
+enddef ;
+
+vardef c_phantom (expr b) (text t) =
+    if b :
+        save temp_p; picture temp_p ;
+        temp_p := image(t) ;
+        addto temp_p also currentpicture ;
+        setbounds currentpicture to boundingbox temp_p ;
+    else :
+        t ;
+    fi ;
+enddef ;
+
+permanent phantom ;
+
+%D Handy:
+
+def break =
+    exitif true ; % fi
+enddef ;
+
+permanent break ;
+
+%D New too:
+
+primarydef p xstretched w = (
+    p if (bbwidth (p)>0) and (w>0) : xscaled (w/bbwidth (p)) fi
+) enddef ;
+
+primarydef p ystretched h = (
+    p if (bbheight(p)>0) and (h>0) : yscaled (h/bbheight(p)) fi
+) enddef ;
+
+permanent xstretched, ystretched ;
+
+%D Newer:
+
+vardef area expr p =
+    % we could calculate the boundingbox once
+    (xpart llcorner boundingbox p,0) -- p --
+    (xpart lrcorner boundingbox p,0) -- cycle
+enddef ;
+
+vardef basiccolors[] =
+    if @ = 0 :
+        white
+    else :
+        save n ; n := @ mod 7 ;
+        if     n = 1 : red
+        elseif n = 2 : green
+        elseif n = 3 : blue
+        elseif n = 4 : cyan
+        elseif n = 5 : magenta
+        elseif n = 6 : yellow
+        else         : black
+        fi
+    fi
+enddef ;
+
+% vardef somecolor = (1,1,0,0) enddef ;
+
+% fill OverlayBox withcolor (rcomponent somecolor,gcomponent somecolor,bcomponent somecolor) ;
+% fill OverlayBox withcolor (ccomponent somecolor,mcomponent somecolor,ycomponent somecolor,bcomponent somecolor) ;
+
+% This could be standard mplib 2 behaviour:
+
+% vardef rcomponent expr p = if rgbcolor  p : redpart     elseif cmykcolor p : 1 - cyanpart    fi p enddef ;
+
+vardef rcomponent expr p = if rgbcolor  p : redpart     p elseif cmykcolor p : 1 - cyanpart    p else : p fi enddef ;
+vardef gcomponent expr p = if rgbcolor  p : greenpart   p elseif cmykcolor p : 1 - magentapart p else : p fi enddef ;
+vardef bcomponent expr p = if rgbcolor  p : bluepart    p elseif cmykcolor p : 1 - yellowpart  p else : p fi enddef ;
+vardef ccomponent expr p = if cmykcolor p : cyanpart    p elseif rgbcolor  p : 1 - redpart     p else : p fi enddef ;
+vardef mcomponent expr p = if cmykcolor p : magentapart p elseif rgbcolor  p : 1 - greenpart   p else : p fi enddef ;
+vardef ycomponent expr p = if cmykcolor p : yellowpart  p elseif rgbcolor  p : 1 - bluepart    p else : p fi enddef ;
+vardef kcomponent expr p = if cmykcolor p : blackpart   p elseif rgbcolor  p : 0                 else : p fi enddef ;
+
+permanent rcomponent, gcomponent, bcomponent, ccomponent, mcomponent, ycomponent, kcomponent ;
+
+% draw image       (...) ... ; % prescripts prepended to first, postscripts appended to last
+% draw decorated   (...) ... ; % prescripts prepended to each,  postscripts appended to each
+% draw redecorated (...) ... ; % prescripts assigned  to each,  postscripts assigned to each
+% draw undecorated (...) ... ; % following properties are ignored, existing properties are kept
+%
+% draw decorated (
+%     draw fullcircle scaled 20cm withpen pencircle scaled 20mm withcolor red   withtransparency (1,.40) ;
+%     draw fullcircle scaled 15cm withpen pencircle scaled 15mm withcolor green withtransparency (1,.30) ;
+%     draw fullcircle scaled 10cm withpen pencircle scaled 10mm withcolor blue  withtransparency (1,.20) ;
+% )
+%     withcolor blue
+%     withtransparency (1,.125) % selectively applied
+%     withpen pencircle scaled 10mm
+% ;
+
+% vardef image (text imagedata) = % already defined
+%     save currentpicture ;
+%     picture currentpicture ;
+%     currentpicture := nullpicture ;
+%     imagedata ;
+%     currentpicture
+% enddef ;
+
+vardef undecorated (text t) text decoration =
+    save currentpicture ;
+    picture currentpicture ;
+    currentpicture := nullpicture ;
+    t ;
+    currentpicture
+enddef ;
+
+vardef decorated (text imagedata) text decoration =
+    save mfun_decorated_path, currentpicture ;
+    picture mfun_decorated_path, currentpicture ;
+    currentpicture := nullpicture ;
+    imagedata ;
+    mfun_decorated_path := currentpicture ;
+    currentpicture := nullpicture ;
+    for i within mfun_decorated_path :
+        addto currentpicture
+            if stroked i :
+                doublepath pathpart i
+                dashed dashpart i
+                withpen penpart i
+                withcolor colorpart i
+                withprescript prescriptpart i
+                withpostscript postscriptpart i
+                decoration
+            elseif filled i :
+                contour pathpart i
+                withpen penpart i
+                withcolor colorpart i
+                withprescript prescriptpart i
+                withpostscript postscriptpart i
+                decoration
+            elseif textual i :
+                also i
+                withcolor colorpart i
+                withprescript prescriptpart i
+                withpostscript postscriptpart i
+                decoration
+            else :
+                also i
+            fi
+        ;
+    endfor ;
+    currentpicture
+enddef ;
+
+vardef redecorated (text imagedata) text decoration =
+    save mfun_decorated_path, currentpicture ;
+    picture mfun_decorated_path, currentpicture ;
+    currentpicture := nullpicture ;
+    imagedata ;
+    mfun_decorated_path := currentpicture ;
+    currentpicture := nullpicture ;
+    for i within mfun_decorated_path :
+        addto currentpicture
+            if stroked i :
+                doublepath pathpart i
+                dashed dashpart i
+                withpen penpart i
+                decoration
+            elseif filled i :
+                contour pathpart i
+                withpen penpart i
+                decoration
+            elseif textual i :
+                also i
+                decoration
+            else :
+                also i
+            fi
+        ;
+    endfor ;
+    currentpicture
+enddef ;
+
+permanent decorated, undecorated, redecorated ;
+
+% path mfun_bleed_box ;
+
+% primarydef p bleeded d =
+%     image (
+%         mfun_bleed_box := boundingbox p ;
+%         if pair d :
+%             draw p xysized (bbwidth(p)+2*xpart d,bbheight(p)+2*ypart d) shifted -d ;
+%         else :
+%             draw p xysized (bbwidth(p)+2d,bbheight(p)+2d) shifted (-d,-d) ;
+%         fi ;
+%         setbounds currentpicture to mfun_bleed_box ;
+%     )
+% enddef ;
+
+vardef mfun_snapped(expr p, s) =
+    if p < 0 : - ( - else : ( fi p div s) * s % the less tokens the better
+enddef ;
+
+vardef mfun_applied(expr p, s)(suffix a) =
+    if path p :
+        if pair s :
+            for i=0 upto length(p)-1 :
+                (a(xpart point i of p,xpart s),a(ypart point i of p,ypart s)) --
+            endfor
+            if cycle p :
+                cycle
+            else :
+                (a(xpart point length(p) of p,xpart s),a(ypart point length(p) of p,ypart s))
+            fi
+        else :
+            for i=0 upto length(p)-1 :
+                (a(xpart point i of p,s),a(ypart point i of p,s)) --
+            endfor
+            if cycle p :
+                cycle
+            else :
+                (a(xpart point length(p) of p,s),a(ypart point length(p) of p,s))
+            fi
+        fi
+    elseif pair p :
+        if pair s :
+            (a(xpart p,xpart s),a(ypart p,ypart s))
+        else :
+            (a(xpart p,s),a(ypart p,s))
+        fi
+    elseif cmykcolor p :
+       (a(cyanpart p,s),a(magentapart p,s),a(yellowpart p,s),a(blackpart p,s))
+    elseif rgbcolor p :
+       (a(redpart p,s),a(greenpart p,s),a(bluepart p,s))
+    elseif graycolor p :
+        a(p,s)
+    elseif numeric p :
+        a(p,s)
+    else
+        p
+    fi
+enddef ;
+
+primarydef p snapped s =
+    mfun_applied(p,s)(mfun_snapped) % so we can play with variants
+enddef ;
+
+permanent snapped ;
+
+% Take a look at mp-tool.mpiv for the old implementation if the next code. We only
+% provide this for old times sake. We assume that the lmt_ commands are defined by
+% the time this is used:
+%
+% beginfont("demo-symbols");
+%     beginglyph(9754,2,4,0) ; % high voltage
+%         interim ahlength := 1 ;
+%         drawarrow (1,4) -- (0,2) -- (2,3) -- (1,0) withcolor darkred ;
+%     endglyph ;
+% endfont;
+
+picture font_glyph[][] ;
+numeric font_count ; font_count := 0;
+
+def beginfont(expr n) =
+    begingroup ;
+    save name ; string name; name := n;
+    font_count := font_count + 1 ;
+    lmt_registerglyphs [
+        name   = name,
+        units  = 10,
+        width  = 10,
+        height = 8,
+        depth  = 2,
+    ] ;
+enddef ;
+
+def endfont =
+    endgroup;
+enddef ;
+
+def beginglyph(expr u, w, h, d) =
+    save unicode ; unicode := u;
+    lmt_registerglyph [
+        category = name,
+        unicode  = u,
+        code     = "draw font_glyph[" & decimal font_count & "][" & decimal u & "];"
+        width    = w,
+        height   = h,
+        depth    = d,
+    ] ;
+    currentpicture := nullpicture ;
+enddef ;
+
+def endglyph =
+    font_glyph[font_count][unicode] := currentpicture ;
+enddef ;
+
+permanent beginfont, endfont, beginglyph, endglyph ;
+
+%D Dimensions have never been an issue as traditional MP can't make that large
+%D pictures, but with double mode we need a catch:
+
+newinternal maxdimensions ; maxdimensions := 14000 ;
+
+def mfun_apply_max_dimensions = % not a generic helper, we want to protect this one
+    if bbwidth currentpicture > maxdimensions :
+        currentpicture := currentpicture if bbheight currentpicture  > bbwidth currentpicture : ysized else : xsized fi maxdimensions ;
+    elseif bbheight currentpicture  > maxdimensions :
+        currentpicture := currentpicture ysized maxdimensions ;
+    fi ;
+enddef;
+
+extra_endfig := extra_endfig & "mfun_apply_max_dimensions ;" ;
+
+%D Bonus shapes (need along):
+
+path unittriangle, fulltriangle ; % not really units but circle based
+
+unittriangle := point 0   along unitcircle
+             -- point 1/3 along unitcircle
+             -- point 2/3 along unitcircle
+             -- cycle ;
+fulltriangle := point 0   along fullcircle
+             -- point 1/3 along fullcircle
+             -- point 2/3 along fullcircle
+             -- cycle ;
+
+immutable unittriangle, fulltriangle ;
+
+%D Kind of special and undocumented. On Wikipedia one can find examples
+%D of quick sort routines. Here we have a variant that permits a
+%D method.
+
+% vardef listsize(suffix list) =
+%     numeric len ; len := 0 ;
+%     forever :
+%         exitif unknown list[len+1] ;
+%         len := len + 1 ;
+%     endfor ;
+%     len
+% enddef ;
+
+vardef listsize(suffix list) =
+    numeric len ; len := 1 ;
+    forever :
+        exitif unknown list[len] ;
+        len := len + 1 ;
+    endfor ;
+    len if unknown list[0] : - 1 fi
+enddef ;
+
+vardef listlast(suffix list) =
+    numeric len ; len := if known list[0] : 0 else : 1 fi  ;
+    forever :
+        len := len + 1 ;
+        exitif unknown list[len] ;
+    endfor ;
+    len - 1
+enddef ;
+
+vardef mfun_quick_sort(suffix list)(expr asked_min, asked_max)(text what) =
+    save l, r, m ;
+    numeric l ; l := asked_min ;
+    numeric r ; r := asked_max ;
+    numeric m ; m := floor(.5[asked_min,asked_max]) ;
+    asked_mid := what list[m] ;
+    forever :
+        exitif l >= r ;
+        forever :
+            exitif l > asked_max ;
+          % exitif (what list[l]) >= (what list[m]) ;
+            exitif (what list[l]) >= asked_mid ;
+            l := l + 1 ;
+        endfor ;
+        forever :
+            exitif r < asked_min ;
+          % exitif (what list[m]) >= (what list[r]) ;
+            exitif asked_mid >= (what list[r]) ;
+            r := r - 1 ;
+        endfor ;
+        if l <= r :
+          temp := list[l] ;
+          list[l] := list[r] ;
+          list[r] := temp ;
+          l := l + 1 ;
+          r := r - 1 ;
+        fi ;
+    endfor ;
+    if asked_min < r :
+        mfun_quick_sort(list)(asked_min,r)(what) ;
+    fi ;
+    if l < asked_max :
+        mfun_quick_sort(list)(l,asked_max)(what) ;
+    fi ;
+enddef ;
+
+vardef sortlist(suffix list)(text what) =
+    save asked_max ; numeric asked_max ;
+    save asked_mid ; numeric asked_mid ;
+    save temp ;
+  % asked_max := listsize(list) ;
+    asked_max := listlast(list) ;
+    if pair list[asked_max] :
+        pair temp ;
+    else :
+        numeric temp ;
+    fi ;
+    if pair what list[asked_max] :
+        pair asked_mid ;
+    else :
+        numeric asked_mid ;
+    fi ;
+    if asked_max > 1 :
+      % mfun_quick_sort(list)(1,asked_max)(what) ;
+        mfun_quick_sort(list)(if known list[0] : 0 else : 1 fi,asked_max)(what) ;
+    fi ;
+enddef ;
+
+vardef uniquelist(suffix list) =
+    % this one will be defined later
+enddef ;
+
+vardef copylist(suffix list, target) =
+    save i ; i := 1 ;
+    forever :
+        exitif unknown list[i] ;
+        target[i] := list[i] ;
+        i := i + 1 ;
+    endfor ;
+enddef ;
+
+vardef listtolines(suffix list) =
+    list[1] for i=2 upto listsize(list) : -- list[i] endfor
+enddef ;
+
+vardef listtocurves(suffix list) =
+    list[1] for i=2 upto listsize(list) : .. list[i] endfor
+enddef ;
+
+%D The sorter is used in:
+
+% not yet ok
+
+vardef shapedlist(suffix p) = % takes a list of paths
+    save l ; pair l[] ;
+    save r ; pair r[] ;
+    save i ; i := 1 ;
+    save n ; n := 0 ;
+    forever :
+        exitif unknown p[i] ;
+        n := n + 1 ;
+        l[n] := ulcorner p[i] ;
+        r[n] := urcorner p[i] ;
+        n := n + 1 ;
+        l[n] := llcorner p[i] ;
+        r[n] := lrcorner p[i] ;
+        i := i + 1 ;
+    endfor ;
+    for i = 3 upto n :
+        if xpart r[i] < xpart r[i-1] :
+            r[i] := (xpart r[i],ypart r[i-1]) ;
+        elseif xpart r[i] > xpart r[i-1] :
+            r[i-1] := (xpart r[i-1],ypart r[i]) ;
+        fi ;
+        if xpart l[i] < xpart l[i-1] :
+            l[i-1] := (xpart l[i-1],ypart l[i]) ;
+        elseif xpart l[i] > xpart l[i-1] :
+            l[i] := (xpart l[i],ypart l[i-1]) ;
+        fi ;
+    endfor ;
+    if n > 0 :
+        simplified (
+            for i = 1 upto   n : r[i] -- endfor
+            for i = n downto 1 : l[i] -- endfor
+            cycle
+        )
+    else :
+        origin -- cycle
+    fi
+enddef ;
+
+permanent listsize, listlast, sortlist, uniquelist, copylist, listtolines, listtocurves, shapedlist ;
+
+%D Dumping is fake anyway but let's keep this:
+
+let dump = relax ;
+
+%D Loading modules can be done with:
+
+def loadmodule expr name = % no vardef
+    % input can't be used directly in a macro
+    if unknown scantokens("context_" & name) :
+        save s ; string s ;
+      % s := "mp-" & name & ".mpiv" ;
+      % message("loading module",s) ;
+      % s := "input " & s ;
+        s := "input " & "mp-" & name & ".mpiv" ;
+        expandafter scantokens expandafter s
+    fi ;
+enddef ;
+
+def loadfile  (expr filename) =       scantokens("input " & filename)   enddef ;
+def loadimage (expr filename) = image(scantokens("input " & filename);) enddef ;
+
+permanent loadmodule, loadfile, loadimage ;
+
+%D Handy for backgrounds:
+
+def drawpathwithpoints expr p =
+    do_drawpathwithpoints(p)
+enddef ;
+
+def do_drawpathwithpoints(expr p) text t =
+    draw p t ;
+    if length(p) > 2 :
+        begingroup ;
+        save temp_c ; path temp_c ;
+        save temp_p; picture temp_p ;
+        temp_p := image (
+            temp_c := if cycle p : fullsquare else : fullcircle fi scaled 6pt ;
+            for i=0 upto length(p) if cycle p : -1 fi :
+                fill temp_c shifted point i of p withcolor white ;
+                draw temp_c shifted point i of p withcolor white/2 withpen pencircle scaled .5pt ;
+                if (i = 0) and cycle p :
+                    temp_c := fullcircle scaled 6pt ;
+                fi ;
+            endfor ;
+            for i=0 upto length(p) if cycle p : -1 fi :
+                draw textext("\infofont " & decimal i) ysized 2pt shifted point i of p ;
+            endfor ;
+        ) ;
+        setbounds temp_p to boundingbox p ;
+        draw temp_p ;
+    fi ;
+enddef ;
+
+%D These new helpers are by Alan and are used in for instance the mp-node
+%D module.
+
+newinternal crossingdebug     ; crossingdebug     := 0 ;
+newinternal crossingscale     ; crossingscale     := 10 ;
+newinternal crossingnumbermax ; crossingnumbermax := 1000 ;
+
+% primary, secondary or tertiary? always hard to decide but primary makes sense
+
+vardef infotext@#(expr txt, ysize) =
+    textext@#("\infofont " & if numeric txt : decimal fi txt) ysized ysize
+enddef ;
+
+primarydef p crossingunder q =
+    begingroup
+    save pic ; picture pic ; pic := nullpicture ;
+    if picture p :
+        for i within p :
+            if stroked i :
+                addto pic also image(draw pathpart i crossingunder q) ;
+            fi
+        endfor
+    elseif path p :
+        save n, t, a, b, c, r, bcuttings, hold ;
+        numeric n, t[], hold ;
+        path a, b, c, r, bcuttings, hold[] ;
+        c := makepath(currentpen scaled crossingscale) ;
+        r := if picture q : boundingbox fi q ;
+        t[0] := n := hold := 0 ;
+        a := p ;
+        % The cutbefore/cutafter using c below prevents endless loops!
+       %forever : % find all intersections
+        for i=1 upto crossingnumbermax : % safeguard
+            clearxy ; z = a intersectiontimes r ;
+            if x < 0 :
+                exitif hold < 1 ;
+                a := hold[hold] ; hold := hold - 1 ;
+                clearxy ; z = a intersectiontimes r ;
+            fi
+            (t[incr n], whatever) = p intersectiontimes point x of a ;
+            if x = 0 :
+                a := a cutbefore c shifted point x of a ;
+            elseif x = length a :
+                a := a cutafter  c shifted point x of a ;
+            else : % before or after?
+                b := subpath (0,x)        of a cutafter  c shifted point x of a ;
+                bcuttings := cuttings ;
+                a := subpath (x,length a) of a cutbefore c shifted point x of a ;
+                clearxy ; z = a intersectiontimes r ;
+                if x < 0 :
+                    a := b ;
+                    cuttings := bcuttings ;
+                else :
+                    if length bcuttings > 0 :
+                        clearxy ; z = b intersectiontimes r ;
+                        if x >= 0 :
+                            hold[incr hold] := b ;
+                        fi
+                    fi
+                fi
+            fi
+            if length cuttings = 0 : % a single point: nothing cut
+                exitif hold < 1 ;
+                a := hold[hold] ; hold := hold - 1 ;
+            fi
+            if i = crossingnumbermax :
+                message("crossingunder reached maximum " & decimal i & " intersections.");
+            fi
+        endfor
+
+        if n = 0 : % No crossings, we return the PATH
+            save pic ; path pic ; pic := p ;
+        else : % n>0
+            sortlist(t,) ;
+            % we add too much, maybe a test is needed
+            t[incr n] = length p if cycle p : + t[1] fi ;
+% save tt[] ; numeric tt[] ; uniquelist(t,tt) ; t := tt ;
+            % Now, n>1 !
+            % t[0] is the first point of the path and t[n] is the last point
+            % (or the first intersection beyond the length if cyclic)
+            save m ; m := 0 ;
+            for i=if cycle p: 2 else: 1 fi upto n :
+                % skip the first segment if cyclic
+                % as it gets repeated (fully) at the end.
+                if crossingdebug > 0 :
+                    if crossingdebug = 1 :
+                        addto pic doublepath c shifted point t[i] of p
+                        withpen currentpen withtransparency(1,.5) ;
+                    elseif crossingdebug = 2 :
+                        addto pic also
+                        infotext (incr m,crossingscale/5)
+                        shifted point t[i] of p ;
+                    fi
+                fi
+                a := subpath (t[i-1],t[i]) of p
+                    if i > 1 :
+                        cutbefore (c shifted point t[i-1] of p)
+                    fi
+                    if (i < n) or (cycle p) :
+                        cutafter  (c shifted point t[i]   of p)
+                    fi ;
+                if (not picture q) or (a outsideof q) :
+                    addto pic doublepath a withpen currentpen ;
+                fi
+            endfor
+        fi
+    fi
+    pic
+    endgroup
+enddef ;
+
+primarydef p insideof q =
+    begingroup
+        save pth, pic, t ;
+        path pth ; picture pic ;
+        pic := if path q : image(draw q;) else : q fi ;
+        pth := p -- center pic ;
+        (t, whatever) = pth intersectiontimes boundingbox pic ;
+        t < 0
+    endgroup
+enddef ;
+
+% primarydef p insideof q =
+%     if (path q or picture q) :
+%         if (path p or picture p) :
+%             (xpart llcorner p > xpart llcorner q) and
+%             (xpart urcorner p < xpart urcorner q) and
+%             (ypart llcorner p > ypart llcorner q) and
+%             (ypart urcorner p < ypart urcorner q)
+%         elseif pair p  :
+%             (xpart p > xpart llcorner q) and
+%             (xpart p < xpart urcorner q) and
+%             (ypart p > ypart llcorner q) and
+%             (ypart p < ypart urcorner q)
+%         fi
+%     elseif (numeric p and pair q) :
+%         % range check
+%         (p >= xpart q) and (p <= ypart q)
+%     else : % maybe triplets and such
+%         false
+%     fi
+% enddef ;
+
+primarydef p outsideof q =
+    not (p insideof q)
+enddef ;
+
+permanent crossingdebug, crossingscale, crossingnumberm, infotext, crossingunder, insideof, outsideof ;
+
+%D Also handy:
+
+vardef circularpath primary n =
+    reverse (for i=0 step 2/n until 8-2/n+2eps: point i of fullcircle .. endfor cycle) rotated 90
+enddef ;
+
+vardef squarepath primary n =
+    for i=0 step 1/n until 4-1/n + 2eps: point i of fullsquare -- endfor cycle
+enddef ;
+
+vardef linearpath primary n =
+    origin for i=1/n step 1/n until 1-1/n + 2eps: -- point i of (origin--(1,0)) endfor
+enddef ;
+
+permanent circularpath, squarepath, linearpath ;
+
+%D  A nice tracing helper:
+
+color       pensilcolor ; pensilcolor := .5red ;
+newinternal pensilstep  ; pensilstep  := 1/25 ;
+
+vardef pensilled(expr p, q) =
+    image (
+        draw p withcolor pensilcolor withpen q ;
+        for i = 0 step pensilstep until length(p) + eps:
+            draw point i of p withcolor white withtransparency (1,.5) withpen q ;
+        endfor ;
+    )
+enddef ;
+
+permanent pensilled, pensilcolor, pensilstep ;
+
+%D Easy to forget but handy for manuals:
+
+vardef tolist(suffix l)(text t) =
+    save n ; n := 1 ;
+    for p = t :
+        if numeric p :
+            n := p ;
+            dispose(l[n])
+        elseif pair p :
+            l[n] := p ;
+            n := n + 1 ;
+        elseif path p :
+            for i=0 step 1 until length(p) :
+                l[n] := point i of p ;
+                n := n + 1 ;
+            endfor ;
+        else :
+            % ignore
+        fi ;
+    endfor ;
+    forever :
+        exitif unknown l[n] ;
+        dispose(l[n])
+        n := n + 1 ;
+    endfor ;
+enddef ;
+
+vardef topath(suffix p)(text t) =
+    save i ; i := if known p[1] : 2 ; p[1] elseif known p[0] : 1 ; p[0] else : 0 ; origin fi
+    forever :
+        exitif unknown p[i] ;
+        t p[i]
+        hide(i := i + 1)
+    endfor
+enddef ;
+
+vardef tocycle(suffix p)(text t) =
+    topath(p,t) t cycle
+enddef ;
+
+permanent tolist, topath, tocycle ;
+
+% reimplemented to support paths and pictures
+
+def drawdot expr p =
+    if pair p :
+        addto currentpicture doublepath p
+            withpen currentpen base_draw_options
+    elseif path p :
+        draw image (
+            for i=0 upto length p :
+                addto currentpicture doublepath point i of p
+                    withpen currentpen base_draw_options ;
+            endfor ;
+        )
+    elseif picture p :
+        draw image (
+            save pp ; path pp ;
+            for i within p :
+                if stroked i or filled i :
+                    pp := pathpart i ;
+                    for j=0 upto length pp :
+                        addto currentpicture doublepath point j of pp
+                            withpen currentpen base_draw_options ;
+                    endfor ;
+                fi ;
+            endfor ;
+        )
+    fi
+enddef ;
+
+permanent drawdot ;
+
+% vardef textlength(text t) =
+%     save n ; n := 0 ;
+%     for i = t :
+% 		n := n + 1 ;
+% 	endfor;
+%     n
+% enddef;
+
+vardef mfun_timestamp =
+    decimal year                        & "-" &
+    decimal month                       & "-" &
+    decimal day                         & " " &
+    if ((time div 60) < 10)           :   "0" & fi
+    decimal (time div 60)               & ":" &
+    if ((time-(time div 60)*60) < 10) :   "0" & fi
+    decimal (time-(time div 60)*60)
+enddef ;
+
+vardef totransform(expr x, y, xx, xy, yx, yy) =
+    save t ; transform t ;
+    xxpart t = xx ; yypart t = yy ;
+    xypart t = xy ; yxpart t = yx ;
+    xpart  t = x  ; ypart  t = y  ;
+    t
+enddef ;
+
+vardef bymatrix(expr rx, sx, sy, ry, tx, ty) =
+    save t ; transform t ;
+    xxpart t = rx ; yypart t = ry ;
+    xypart t = sx ; yxpart t = sy ;
+    xpart  t = tx ; ypart  t = ty ;
+    t
+enddef ;
+
+permanent totransform, bymatrix ;
+
+let xslanted = slanted ;
+
+def yslanted primary s =
+    transformed
+        begingroup
+            save t ; transform t ;
+            xxpart t = 1 ; yypart t = 1 ;
+            xypart t = 0 ; yxpart t = s ;
+            xpart  t = 0 ; ypart  t = 0 ;
+            t
+        endgroup
+enddef ;
+
+permanent xslanted, yslanted ;
diff --git a/metapost/context/fonts/mpiv/bidi-symbols.mp b/metapost/context/fonts/mpiv/bidi-symbols.mp
index abe48b951..926e1c5fd 100644
--- a/metapost/context/fonts/mpiv/bidi-symbols.mp
+++ b/metapost/context/fonts/mpiv/bidi-symbols.mp
@@ -52,6 +52,8 @@ numeric font_bidi_wd ; font_bidi_wd := -12 ;
 %     setbounds currentpicture to boundingbox nullpicture ;
 % endfig ;
 
+beginfont("bidi-symbols") ;
+
 beginglyph(8234,0,0,0) ; % lre
     drawarrow (0,0) -- (0,font_bidi_dp) -- (font_bidi_wd,font_bidi_dp) withcolor red ;
 endglyph ;
@@ -71,3 +73,5 @@ endglyph ;
 beginglyph(8238,0,0,0) ; % rlo
     drawarrow reverse ((0,0) -- (0,font_bidi_dp) -- (-font_bidi_wd,font_bidi_dp)) withcolor green ;
 endglyph ;
+
+endfont ;
diff --git a/metapost/context/fonts/mpiv/demo-symbols.mp b/metapost/context/fonts/mpiv/demo-symbols.mp
index 822854c94..f74189a1b 100644
--- a/metapost/context/fonts/mpiv/demo-symbols.mp
+++ b/metapost/context/fonts/mpiv/demo-symbols.mp
@@ -14,8 +14,11 @@
 passvariable("fontname","demo-symbols") ;
 passvariable("fontversion","1.005") ;
 
+beginfont("demo-symbols") ;
+
 beginglyph(9754,2,4,0) ; % high voltage
     interim ahlength := 1 ;
     drawarrow (1,4) -- (0,2) -- (2,3) -- (1,0) withcolor darkred ;
 endglyph ;
 
+endfont ;
diff --git a/scripts/context/lua/mtx-install.lua b/scripts/context/lua/mtx-install.lua
index 94c47e9db..614d20e92 100644
--- a/scripts/context/lua/mtx-install.lua
+++ b/scripts/context/lua/mtx-install.lua
@@ -88,7 +88,8 @@ local platforms = {
     ["linux-64"]       = "linux-64",
     ["linux64"]        = "linux-64",
     --
-    ["linuxmusl-64"]   = "linuxmusl-64",
+    ["linuxmusl-64"]   = "linuxmusl",
+    ["linuxmusl"]      = "linuxmusl",
     --
     ["linux-armhf"]    = "linux-armhf",
     --
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 79a8f46d6..01555af45 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{2020.12.10 22:23}
+\newcontextversion{2020.12.15 10:10}
 
 %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 80a42b727..8b46e9081 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{2020.12.10 22:23}
+\edef\contextversion{2020.12.15 10:10}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 5b7f4831b..beded1600 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{2020.12.10 22:23}
+\newcontextversion{2020.12.15 10:10}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 8b645e33a..4aaaf492d 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{2020.12.10 22:23}
+\edef\contextversion{2020.12.15 10:10}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/data-tex.lua b/tex/context/base/mkiv/data-tex.lua
index 2e8642cdd..55383c1fe 100644
--- a/tex/context/base/mkiv/data-tex.lua
+++ b/tex/context/base/mkiv/data-tex.lua
@@ -149,6 +149,9 @@ local function textopener(tag,filename,filehandle,coding)
         filename    = filename,
         noflines    = noflines,
      -- currentline = 0,
+        endoffile   = function()
+            return not lines or currentline >= noflines
+        end,
         close       = function()
             local usedname = popinputname() -- should match filename
             if trace_locating then
diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index 5c93f302f..eead8abff 100644
--- a/tex/context/base/mkiv/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
@@ -1840,10 +1840,6 @@ function mappings.reset()
     lpdf.setmapfile("") -- tricky ... backend related
 end
 
-function mappings.getentry(...)
-    return lpdf.getmapentry(...) -- tricky ... backend related
-end
-
 implement {
     name      = "loadmapfile",
     actions   = mappings.loadfile,
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index 095900861..41ca68613 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -2,7 +2,7 @@ return {
     internals = {
         --
         "nocolormodel", "greycolormodel", "graycolormodel", "rgbcolormodel", "cmykcolormodel",
-        "shadefactor",
+        "shadefactor", "shadeoffset",
         "textextoffset", "textextanchor",
         "normaltransparent", "multiplytransparent", "screentransparent", "overlaytransparent",
         "softlighttransparent", "hardlighttransparent", "colordodgetransparent", "colorburntransparent",
@@ -17,7 +17,7 @@ return {
         "drawoptionsfactor",
         "dq", "sq",
         "crossingscale", "crossingoption",
-        "contextlmtxmode",
+        "contextlmtxmode", "metafunversion",
         --
         -- for the moment we put these here as they need to stand out
         --
@@ -74,6 +74,7 @@ return {
         "withshadedomain", "withshademethod", "withshadefactor", "withshadevector",
         "withshadecenter", "withshadedirection", "withshaderadius", "withshadetransform",
         "withshadestep", "withshadefraction", "withshadeorigin", "shownshadevector", "shownshadeorigin",
+        "shownshadedirection", "shownshadecenter",
         "cmyk", "spotcolor", "multitonecolor", "namedcolor",
         "drawfill", "undrawfill",
         "inverted", "uncolored", "softened", "grayed", "greyed",
@@ -85,6 +86,7 @@ return {
         "withmask", "bitmapimage",
         "colordecimals", "ddecimal", "dddecimal", "ddddecimal", "colordecimalslist",
         "textext", "thetextext", "rawtextext", "textextoffset", "texbox", "thetexbox", "rawtexbox", "istextext",
+        "rawmadetext", "validtexbox", "onetimetextext", "rawfmttext", "thefmttext", "fmttext", "onetimefmttext",
         "notcached", "keepcached",
         "verbatim",
         "thelabel", "label",
@@ -191,10 +193,10 @@ return {
         --
         "isarray", "prefix", "isobject",
         --
-        "comment", "report", "lua", "mp", "MP", "luacall",
+        "comment", "report", "lua", "lualist", "mp", "MP", "luacall",
         --
         "mirrored", "mirroredabout",
         --
-        "scriptindex",
+        "scriptindex", "newscriptindex",
     },
 }
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index be507394d..fb786231e 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -50,7 +50,7 @@ return {
         "inicatcodes",
         "ctxcatcodes", "texcatcodes", "notcatcodes", "txtcatcodes", "vrbcatcodes",
         "prtcatcodes", "nilcatcodes", "luacatcodes", "tpacatcodes", "tpbcatcodes",
-        "xmlcatcodes", "ctdcatcodes",
+        "xmlcatcodes", "ctdcatcodes", "rlncatcodes",
         --
         "escapecatcode", "begingroupcatcode", "endgroupcatcode", "mathshiftcatcode", "alignmentcatcode",
         "endoflinecatcode", "parametercatcode", "superscriptcatcode", "subscriptcatcode", "ignorecatcode",
@@ -362,8 +362,8 @@ return {
         "getvalue", "getuvalue", "setvalue", "setevalue", "setgvalue", "setxvalue", "letvalue", "letgvalue",
         "resetvalue", "undefinevalue", "ignorevalue",
         "setuvalue", "setuevalue", "setugvalue", "setuxvalue",
-        --
-        "globallet", "glet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique",
+        -- glet
+        "globallet", "udef", "ugdef", "uedef", "uxdef", "checked", "unique",
         --
         "getparameters", "geteparameters", "getgparameters", "getxparameters", "forgetparameters", "copyparameters",
         --
diff --git a/tex/context/base/mkiv/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua
index d2bad606c..d994a3f65 100644
--- a/tex/context/base/mkiv/mult-mps.lua
+++ b/tex/context/base/mkiv/mult-mps.lua
@@ -27,7 +27,6 @@ return {
         "shipout", "show", "showdependencies", "showtoken", "showvariable",
         "special",
         "begingroup", "endgroup", "of", "curl", "tension", "and", "controls",
-        "interpath", "on", "off",
         "def", "vardef", "enddef", "expr", "suffix", "text", "primary", "secondary",
         "tertiary", "primarydef", "secondarydef", "tertiarydef",
         "randomseed", "also", "contour", "doublepath",
@@ -68,11 +67,14 @@ return {
         "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode",
         --
         "runscript", "maketext", "numbersystem",
+        "overloadmode", "setproperty",
     },
     commands = {
+        "on", "off",
+        "interpath",
         "upto", "downto",
         "beginfig", "endfig",
-        "beginglyph", "endglyph", -- actually a mult-fun one
+        "beginglyph", "endglyph", "beginfont", "endfont", -- actually a mult-fun one
         "rotatedaround", "reflectedabout",
         "arrowhead",
         "currentpen", "currentpicture", "cuttings",
@@ -119,6 +121,7 @@ return {
         --
         "triplet", "quadruplet", "totransform", "bymatrix",
         --
+        "primitive", "permanent", "immutable", "mutable", "frozen",
     },
     internals = { -- we need to remove duplicates above
         --
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 709b9330d..e4baa5bde 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 37f1aff8a..03b142f98 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-pag.lua b/tex/context/base/mkiv/strc-pag.lua
index 47fa9463c..6f9cdd429 100644
--- a/tex/context/base/mkiv/strc-pag.lua
+++ b/tex/context/base/mkiv/strc-pag.lua
@@ -35,6 +35,8 @@ local stopapplyprocessor  = processors.stopapply
 local texsetcount         = tex.setcount
 local texgetcount         = tex.getcount
 
+local texconditionals     = tex.conditionals
+
 local ctx_convertnumber   = context.convertnumber
 
 -- storage
@@ -319,6 +321,10 @@ function pages.on_right(n)
     end
 end
 
+function pages.has_changed()
+    return texconditionals.layouthaschanged
+end
+
 function pages.in_body(n)
     return texgetcount("pagebodymode") > 0
 end
diff --git a/tex/context/base/mkxl/catc-ctx.mkxl b/tex/context/base/mkxl/catc-ctx.mkxl
deleted file mode 100644
index fcaec65d0..000000000
--- a/tex/context/base/mkxl/catc-ctx.mkxl
+++ /dev/null
@@ -1,162 +0,0 @@
-%D \module
-%D   [       file=catc-cys,
-%D        version=2006.09.18,
-%D          title=\CONTEXT\ Catcode Macros,
-%D       subtitle=Extra Tables,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D We prefer to define relevant catcode tables in this file instead
-%D of everywhere around.
-
-\ifdefined \ctxcatcodes \else \newcatcodetable \ctxcatcodes \fi
-\ifdefined \prtcatcodes \else \newcatcodetable \prtcatcodes \fi
-\ifdefined \txtcatcodes \else \newcatcodetable \txtcatcodes \fi
-%ifdefined \mthcatcodes \else \newcatcodetable \mthcatcodes \fi % math, not used, too tricky
-\ifdefined \tpacatcodes \else \newcatcodetable \tpacatcodes \fi % { }
-\ifdefined \tpbcatcodes \else \newcatcodetable \tpbcatcodes \fi % < >
-
-\setnewconstant \doublecommentsignal "10FF25 %% < 110000 (last valid range)
-
-\startcatcodetable \ctxcatcodes
-    \catcode\tabasciicode       \spacecatcode
-    \catcode\endoflineasciicode \endoflinecatcode
-    \catcode\formfeedasciicode  \endoflinecatcode
-    \catcode\spaceasciicode     \spacecatcode
-    \catcode\endoffileasciicode \ignorecatcode
-  % \catcode\circumflexasciicode\superscriptcatcode
-  % \catcode\underscoreasciicode\subscriptcatcode
-  % \catcode\ampersandasciicode \alignmentcatcode
-    \catcode\underscoreasciicode\othercatcode
-    \catcode\circumflexasciicode\othercatcode
-    \catcode\ampersandasciicode \othercatcode
-    \catcode\backslashasciicode \escapecatcode
-    \catcode\leftbraceasciicode \begingroupcatcode
-    \catcode\rightbraceasciicode\endgroupcatcode
-    \catcode\dollarasciicode    \mathshiftcatcode
-    \catcode\hashasciicode      \parametercatcode
-    \catcode\commentasciicode   \commentcatcode
-    \catcode\tildeasciicode     \activecatcode
-    \catcode\barasciicode       \activecatcode
-\stopcatcodetable
-
-\startcatcodetable \prtcatcodes
-    \catcode\tabasciicode            \spacecatcode
-    \catcode\endoflineasciicode      \endoflinecatcode
-    \catcode\formfeedasciicode       \endoflinecatcode
-    \catcode\spaceasciicode          \spacecatcode
-    \catcode\endoffileasciicode      \ignorecatcode
-    \catcode\circumflexasciicode     \superscriptcatcode     % candidate
-    \catcode\underscoreasciicode     \lettercatcode
-    \catcode\ampersandasciicode      \alignmentcatcode
-    \catcode\backslashasciicode      \escapecatcode
-    \catcode\leftbraceasciicode      \begingroupcatcode
-    \catcode\rightbraceasciicode     \endgroupcatcode
-    \catcode\dollarasciicode         \mathshiftcatcode
-    \catcode\hashasciicode           \parametercatcode
-    \catcode\commentasciicode        \commentcatcode
-    \catcode\atsignasciicode         \lettercatcode
-    \catcode\exclamationmarkasciicode\lettercatcode
-    \catcode\questionmarkasciicode   \lettercatcode
-    \catcode\tildeasciicode          \activecatcode
-    \catcode\barasciicode            \activecatcode
-\stopcatcodetable
-
-\startcatcodetable \tpacatcodes
-    \catcode\tabasciicode       \othercatcode
-    \catcode\endoflineasciicode \othercatcode
-    \catcode\formfeedasciicode  \othercatcode
-    \catcode\spaceasciicode     \othercatcode
-    \catcode\endoffileasciicode \othercatcode
-    \catcode\leftbraceasciicode \begingroupcatcode
-    \catcode\rightbraceasciicode\endgroupcatcode
-\stopcatcodetable
-
-\startcatcodetable \tpbcatcodes
-    \catcode\tabasciicode       \othercatcode
-    \catcode\endoflineasciicode \othercatcode
-    \catcode\formfeedasciicode  \othercatcode
-    \catcode\spaceasciicode     \othercatcode
-    \catcode\endoffileasciicode \othercatcode
-    \catcode\lessthanasciicode  \begingroupcatcode
-    \catcode\morethanasciicode  \endgroupcatcode
-\stopcatcodetable
-
-\startcatcodetable \txtcatcodes
-    \catcode\tabasciicode       \spacecatcode
-    \catcode\endoflineasciicode \endoflinecatcode
-    \catcode\formfeedasciicode  \endoflinecatcode
-    \catcode\spaceasciicode     \spacecatcode
-    \catcode\endoffileasciicode \ignorecatcode
-    \catcode\backslashasciicode \escapecatcode
-    \catcode\leftbraceasciicode \begingroupcatcode
-    \catcode\rightbraceasciicode\endgroupcatcode
-    \catcode\doublecommentsignal\commentcatcode
-\stopcatcodetable
-
-\letcatcodecommand \ctxcatcodes \barasciicode   \relax
-\letcatcodecommand \ctxcatcodes \tildeasciicode \relax
-
-\pushoverloadmode
-
-     \catcodetable        \ctxcatcodes
-\let \defaultcatcodetable \ctxcatcodes
-
-\popoverloadmode
-
-% for the moment here:
-
-\permanent\protected\def\starttexcode
-  {\pushcatcodetable
-   \catcodetable\prtcatcodes}
-
-\permanent\protected\def\stoptexcode
-  {\popcatcodetable}
-
-\permanent\protected\def\startcontextcode
-  {\pushcatcodetable
-   \catcodetable\ctxcatcodes}
-
-\permanent\protected\def\stopcontextcode
-  {\popcatcodetable}
-
-% not visible, only for special cases
-
-\newcatcodetable \ctdcatcodes % context definitions
-
-\startcatcodetable \ctdcatcodes
-    \catcode\tabasciicode            \ignorecatcode
-    \catcode\endoflineasciicode      \ignorecatcode
-    \catcode\formfeedasciicode       \ignorecatcode
-    \catcode\spaceasciicode          \ignorecatcode
-    \catcode\endoffileasciicode      \ignorecatcode
-    \catcode\circumflexasciicode     \superscriptcatcode     % candidate
-    \catcode\underscoreasciicode     \lettercatcode
-    \catcode\ampersandasciicode      \alignmentcatcode
-%   \catcode\colonasciicode          \lettercatcode          % candidate
-    \catcode\backslashasciicode      \escapecatcode
-    \catcode\leftbraceasciicode      \begingroupcatcode
-    \catcode\rightbraceasciicode     \endgroupcatcode
-    \catcode\dollarasciicode         \mathshiftcatcode
-    \catcode\hashasciicode           \parametercatcode
-    \catcode\commentasciicode        \commentcatcode
-    \catcode\atsignasciicode         \lettercatcode
-    \catcode\exclamationmarkasciicode\lettercatcode
-    \catcode\questionmarkasciicode   \lettercatcode
-    \catcode\tildeasciicode          \activecatcode
-    \catcode\barasciicode            \activecatcode
-\stopcatcodetable
-
-\permanent\protected\def\startcontextdefinitioncode
-  {\pushcatcodetable
-   \catcodetable\ctdcatcodes}
-
-\permanent\protected\def\stopcontextdefinitioncode
-  {\popcatcodetable}
-
-\endinput
diff --git a/tex/context/base/mkxl/catc-def.mkxl b/tex/context/base/mkxl/catc-def.mkxl
index e93345e1c..a67d94e44 100644
--- a/tex/context/base/mkxl/catc-def.mkxl
+++ b/tex/context/base/mkxl/catc-def.mkxl
@@ -11,14 +11,24 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D The following catcode tables are rather \CONTEXT\ independent.
+%D Contrary to \MKIV\ we define the catcode tables in one file. The original split
+%D was a prelude to a split approach where context would run on top of a basic layer
+%D (so that we could make smaller alternative formats) but that idea (from the early
+%D days of \LUATEX) was dropped when I realized that there is not common ground to
+%D cover between formats. It is simply not worth the trouble.
 
-\ifdefined\nilcatcodes \else \newcatcodetable \nilcatcodes  \fi
-\ifdefined\texcatcodes \else \newcatcodetable \texcatcodes  \fi
-\ifdefined\luacatcodes \else \newcatcodetable \luacatcodes  \fi
-\ifdefined\notcatcodes \else \newcatcodetable \notcatcodes  \fi
-\ifdefined\vrbcatcodes \else \newcatcodetable \vrbcatcodes  \fi
-\ifdefined\prtcatcodes \else \newcatcodetable \prtcatcodes  \fi
+\ifdefined\nilcatcodes \else \newcatcodetable \nilcatcodes \fi
+\ifdefined\texcatcodes \else \newcatcodetable \texcatcodes \fi
+\ifdefined\luacatcodes \else \newcatcodetable \luacatcodes \fi
+\ifdefined\notcatcodes \else \newcatcodetable \notcatcodes \fi
+\ifdefined\rlncatcodes \else \newcatcodetable \rlncatcodes \fi
+\ifdefined\vrbcatcodes \else \newcatcodetable \vrbcatcodes \fi
+\ifdefined\prtcatcodes \else \newcatcodetable \prtcatcodes \fi
+\ifdefined\ctxcatcodes \else \newcatcodetable \ctxcatcodes \fi
+\ifdefined\txtcatcodes \else \newcatcodetable \txtcatcodes \fi
+\ifdefined\tpacatcodes \else \newcatcodetable \tpacatcodes \fi % { }
+\ifdefined\tpbcatcodes \else \newcatcodetable \tpbcatcodes \fi % < >
+\ifdefined\ctdcatcodes \else \newcatcodetable \ctdcatcodes \fi % context definitions
 
 \startcatcodetable \nilcatcodes
     \catcode\tabasciicode       \spacecatcode
@@ -88,6 +98,30 @@
     \catcode\barasciicode         \othercatcode
 \stopcatcodetable
 
+\startcatcodetable \rlncatcodes
+    \catcode\tabasciicode         \othercatcode
+    \catcode\endoflineasciicode   \othercatcode
+    \catcode\formfeedasciicode    \othercatcode
+    \catcode\spaceasciicode       \spacecatcode % maybe we also need a vector with space being other
+    \catcode\endoffileasciicode   \othercatcode
+    \catcode\circumflexasciicode  \othercatcode
+    \catcode\underscoreasciicode  \othercatcode
+    \catcode\ampersandasciicode   \othercatcode
+    \catcode\tildeasciicode       \othercatcode
+    \catcode\hashasciicode        \othercatcode
+    \catcode\dollarasciicode      \othercatcode
+    \catcode\commentasciicode     \othercatcode
+    \catcode\lessthanasciicode    \othercatcode
+    \catcode\morethanasciicode    \othercatcode
+    \catcode\leftbraceasciicode   \othercatcode
+    \catcode\rightbraceasciicode  \othercatcode
+    \catcode\doublequoteasciicode \othercatcode
+    \catcode\singlequoteasciicode \othercatcode
+    \catcode\forwardslashasciicode\othercatcode
+    \catcode\backslashasciicode   \othercatcode
+    \catcode\barasciicode         \othercatcode
+\stopcatcodetable
+
 \startcatcodetable \vrbcatcodes % probably less needed
     \catcode\tabasciicode      \othercatcode
     \catcode\endoflineasciicode\othercatcode
@@ -119,6 +153,104 @@
     \catcode\barasciicode            \activecatcode
 \stopcatcodetable
 
+\startcatcodetable \ctxcatcodes
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+  % \catcode\circumflexasciicode\superscriptcatcode
+  % \catcode\underscoreasciicode\subscriptcatcode
+  % \catcode\ampersandasciicode \alignmentcatcode
+    \catcode\underscoreasciicode\othercatcode
+    \catcode\circumflexasciicode\othercatcode
+    \catcode\ampersandasciicode \othercatcode
+    \catcode\backslashasciicode \escapecatcode
+    \catcode\leftbraceasciicode \begingroupcatcode
+    \catcode\rightbraceasciicode\endgroupcatcode
+    \catcode\dollarasciicode    \mathshiftcatcode
+    \catcode\hashasciicode      \parametercatcode
+    \catcode\commentasciicode   \commentcatcode
+    \catcode\tildeasciicode     \activecatcode
+    \catcode\barasciicode       \activecatcode
+\stopcatcodetable
+
+\startcatcodetable \tpacatcodes
+    \catcode\tabasciicode       \othercatcode
+    \catcode\endoflineasciicode \othercatcode
+    \catcode\formfeedasciicode  \othercatcode
+    \catcode\spaceasciicode     \othercatcode
+    \catcode\endoffileasciicode \othercatcode
+    \catcode\leftbraceasciicode \begingroupcatcode
+    \catcode\rightbraceasciicode\endgroupcatcode
+\stopcatcodetable
+
+\startcatcodetable \tpbcatcodes
+    \catcode\tabasciicode       \othercatcode
+    \catcode\endoflineasciicode \othercatcode
+    \catcode\formfeedasciicode  \othercatcode
+    \catcode\spaceasciicode     \othercatcode
+    \catcode\endoffileasciicode \othercatcode
+    \catcode\lessthanasciicode  \begingroupcatcode
+    \catcode\morethanasciicode  \endgroupcatcode
+\stopcatcodetable
+
+\setnewconstant \doublecommentsignal "10FF25 %% < 110000 (last valid range)
+
+\startcatcodetable \txtcatcodes
+    \catcode\tabasciicode       \spacecatcode
+    \catcode\endoflineasciicode \endoflinecatcode
+    \catcode\formfeedasciicode  \endoflinecatcode
+    \catcode\spaceasciicode     \spacecatcode
+    \catcode\endoffileasciicode \ignorecatcode
+    \catcode\backslashasciicode \escapecatcode
+    \catcode\leftbraceasciicode \begingroupcatcode
+    \catcode\rightbraceasciicode\endgroupcatcode
+    \catcode\doublecommentsignal\commentcatcode
+\stopcatcodetable
+
+\startcatcodetable \ctdcatcodes
+    \catcode\tabasciicode            \ignorecatcode
+    \catcode\endoflineasciicode      \ignorecatcode
+    \catcode\formfeedasciicode       \ignorecatcode
+    \catcode\spaceasciicode          \ignorecatcode
+    \catcode\endoffileasciicode      \ignorecatcode
+    \catcode\circumflexasciicode     \superscriptcatcode % candidate
+    \catcode\underscoreasciicode     \lettercatcode
+    \catcode\ampersandasciicode      \alignmentcatcode
+  % \catcode\colonasciicode          \lettercatcode      % candidate
+    \catcode\backslashasciicode      \escapecatcode
+    \catcode\leftbraceasciicode      \begingroupcatcode
+    \catcode\rightbraceasciicode     \endgroupcatcode
+    \catcode\dollarasciicode         \mathshiftcatcode
+    \catcode\hashasciicode           \parametercatcode
+    \catcode\commentasciicode        \commentcatcode
+    \catcode\atsignasciicode         \lettercatcode
+    \catcode\exclamationmarkasciicode\lettercatcode
+    \catcode\questionmarkasciicode   \lettercatcode
+    \catcode\tildeasciicode          \activecatcode
+    \catcode\barasciicode            \activecatcode
+\stopcatcodetable
+
+%D From now on we can use the protection mechanisms.
+
+\permanent\protected\def\unprotect                  {\pushcatcodetable\catcodetable\prtcatcodes}
+\permanent\protected\def\protect                    {\popcatcodetable}
+
+\permanent\protected\def\starttexcode               {\pushcatcodetable\catcodetable\prtcatcodes}
+\permanent\protected\def\stoptexcode                {\popcatcodetable}
+
+\permanent\protected\def\startcontextcode           {\pushcatcodetable\catcodetable\ctxcatcodes}
+\permanent\protected\def\stopcontextcode            {\popcatcodetable}
+
+\permanent\protected\def\startcontextdefinitioncode {\pushcatcodetable\catcodetable\ctdcatcodes}
+\permanent\protected\def\stopcontextdefinitioncode  {\popcatcodetable}
+
+%D We have a few active characters (left):
+
+\letcatcodecommand \ctxcatcodes \barasciicode   \relax
+\letcatcodecommand \ctxcatcodes \tildeasciicode \relax
+
 %D Because some characters have a special meaning, we provide shortcuts to their
 %D character representation. Some will be overloaded (which might change).
 
@@ -133,15 +265,9 @@
 \chardef \\ = \backslashasciicode
 \chardef \| = \barasciicode
 
-% way too wide in lm, so one can also use:
-%
-% \def\_{\dontleavehmode \kern.06em \vbox{\hrule width.3em}} % this will become a \chardef
-
-%D From now on we can use the protection mechanisms.
-
-\permanent\protected\def\unprotect{\pushcatcodetable\setcatcodetable\prtcatcodes}
-\permanent\protected\def\protect  {\popcatcodetable}
-
-% \prependtoks \catcodetable\ctxcatcodes \to \everyjob
+\pushoverloadmode
+         \catcodetable        \ctxcatcodes
+    \let \defaultcatcodetable \ctxcatcodes
+\popoverloadmode
 
 \endinput
diff --git a/tex/context/base/mkxl/catc-ini.mkxl b/tex/context/base/mkxl/catc-ini.mkxl
index b7844fe89..7d23c37d8 100644
--- a/tex/context/base/mkxl/catc-ini.mkxl
+++ b/tex/context/base/mkxl/catc-ini.mkxl
@@ -11,35 +11,14 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D We've split the functionality of syst-cat.* over more files now so that we can
-%D load more selectively.
-
 \registerctxluafile{catc-ini}{}
 
 \unprotect
 
 %D A long standing wish has been the availability of catcode arrays. Because
-%D traditional \TEX\ does not provide this we implement a fake method in the
-%D \MKII\ file. There is some overlap in code with \MKII\ but we take that
-%D for granted. Also, in \MKIV\ less active characters are used.
-
-% \begingroup
-%
-%     \catcode\tabasciicode      \activecatcode
-%     \catcode\formfeedasciicode \activecatcode
-%     \catcode\endoflineasciicode\activecatcode
-%
-%     \letcharcode\tabasciicode      \relax
-%     \letcharcode\newlineasciicode  \relax
-%     \letcharcode\formfeedasciicode \relax
-%     \letcharcode\endoflineasciicode\relax
-%
-%     \xdef\activetabtoken      {\Uchar\tabasciicode      } % \gdef\activetabtoken      {^^I}
-%     \xdef\outputnewlinechar   {\Uchar\newlineasciicode  } % \gdef\outputnewlinechar   {^^J}
-%     \xdef\activeformfeedtoken {\Uchar\formfeedasciicode } % \gdef\activeformfeedtoken {^^L}
-%     \xdef\activeendoflinetoken{\Uchar\endoflineasciicode} % \gdef\activeendoflinetoken{^^M}
-%
-% \endgroup
+%D traditional \TEX\ does not provide this we implement a fake method in the \MKII\
+%D file. There is some overlap in code with \MKII\ but we take that for granted.
+%D Also, in \MKIV\ less active characters are used.
 
 \begingroup
     \letcharcode\newlineasciicode\relax \xdef\outputnewlinechar{\Uchar\newlineasciicode}
@@ -58,7 +37,7 @@
    \endgroup}
 
 %D We predefine some prefixes ahead of syst-aux and mult-sys. We reserve 8 slots for
-%D catcodes.
+%D catcodes. (This active mess probably needs an update some day.)
 
 \installsystemnamespace {catcodelet} % let : \let
 \installsystemnamespace {catcodedef} % def : \def
@@ -225,13 +204,13 @@
 \permanent\protected\def\pushcatcodetable
   {\advance\c_syst_catcodes_level\plusone
    \syst_catcodes_trace_push
-   \expandafter\chardef\csname\??catcodetablet\number\c_syst_catcodes_level\endcsname\currentcatcodetable}
+   \expandafter\integerdef\csname\??catcodetablet\number\c_syst_catcodes_level\endcsname\currentcatcodetable}
 
 \permanent\protected\def\popcatcodetable
   {\ifcase\c_syst_catcodes_level
      \syst_catcodes_trace_nesting_error
    \else
-     \expandafter\catcodetable\csname\??catcodetablet\number\c_syst_catcodes_level\endcsname
+     \catcodetable\csname\??catcodetablet\number\c_syst_catcodes_level\endcsname
      \syst_catcodes_trace_pop
      \advance\c_syst_catcodes_level\minusone
    \fi}
@@ -243,14 +222,14 @@
 
 \permanent\protected\def\restorecatcodes % takes previous level
   {\ifnum\c_syst_catcodes_level>\plusone
-     \expandafter\catcodetable\csname\??catcodetablet\number\numexpr\c_syst_catcodes_level-1\relax\endcsname
+     \catcodetable\csname\??catcodetablet\number\numexpr\c_syst_catcodes_level-1\relax\endcsname
    \fi}
 
 \permanent\protected\def\setcatcodetable#1%
   {\catcodetable#1%
    \syst_catcodes_trace_set}
 
-%D Handy for debugging:
+%D Handy for debugging (not that we ever use(d) it):
 %D
 %D \starttyping
 %D \tracecatcodetables
diff --git a/tex/context/base/mkxl/char-ini.mkxl b/tex/context/base/mkxl/char-ini.mkxl
index 1df5d4b01..6965598a9 100644
--- a/tex/context/base/mkxl/char-ini.mkxl
+++ b/tex/context/base/mkxl/char-ini.mkxl
@@ -15,7 +15,7 @@
 
 \registerctxluafile{char-fio}{}
 \registerctxluafile{char-map}{} % maybe we will load this someplace else
-\registerctxluafile{char-tex}{}
+\registerctxluafile{char-tex}{autosuffix}
 \registerctxluafile{char-ent}{}
 
 \unprotect
@@ -52,7 +52,6 @@
 
 \permanent          \def\checkedchar        {\relax\ifmmode\expandafter\checkedmathchar\else\expandafter\checkedtextchar\fi} % #1#2
 \permanent          \def\checkedmathchar#1#2{#2}
-%permanent          \def\checkedtextchar  #1{\iffontchar\font#1 \expandafter\firstoftwoarguments\else\expandafter\secondoftwoarguments\fi{\char#1}}
 \permanent\protected\def\checkedtextchar  #1{\clf_doifelsecharinfont\numexpr#1\relax{\char#1}} % {#2}
 
 \newconditional\prefermathovertextchar
@@ -87,29 +86,26 @@
      \normalstartimath#1#2\normalstopimath
    \fi}
 
-%D The codes are stored in the format, so we don't need to reinitialize
-%D them (unless of course we have adapted the table). It is on the agenda
-%D to do this with \type {tex.lccode} cum suis once they're available.
-
-% \def\setcclcuc#1#2#3{\global\catcode#1=\lettercatcode\global\lccode#1=#2\global\uccode#1=#3\relax}
-% \def\setcclcucself#1{\global\catcode#1=\lettercatcode\global\lccode#1=#1\global\uccode#1=#1\relax }
+%D The codes are stored in the format, so we don't need to reinitialize them (unless
+%D of course we have adapted the table). It is on the agenda to do this with \type
+%D {tex.lccode} cum suis once they're available.
 
 % Is setting up vrb tpa and tpb needed?
 
 % move to lua side
 
-%clf_setcharactercodes
-
 \clf_setlettercatcodes\texcatcodes
 \clf_setlettercatcodes\ctxcatcodes
 \clf_setlettercatcodes\notcatcodes
 %clf_setlettercatcodes\mthcatcodes
-\clf_setlettercatcodes\vrbcatcodes
+\clf_setlettercatcodes\vrbcatcodes % hm ... we need to  hyphemate
 \clf_setlettercatcodes\prtcatcodes
-\clf_setlettercatcodes\tpacatcodes
-\clf_setlettercatcodes\tpbcatcodes
+\clf_setlettercatcodes\tpacatcodes % hm
+\clf_setlettercatcodes\tpbcatcodes % hm
 \clf_setlettercatcodes\txtcatcodes
 
+\clf_setothercatcodes \rlncatcodes
+
 \clf_setactivecatcodes\ctxcatcodes
 \clf_setactivecatcodes\notcatcodes
 \clf_setactivecatcodes\prtcatcodes
diff --git a/tex/context/base/mkxl/char-tex.lmt b/tex/context/base/mkxl/char-tex.lmt
new file mode 100644
index 000000000..5d2883f21
--- /dev/null
+++ b/tex/context/base/mkxl/char-tex.lmt
@@ -0,0 +1,763 @@
+if not modules then modules = { } end modules ['char-tex'] = {
+    version   = 1.001,
+    comment   = "companion to char-ini.mkiv",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+local lpeg = lpeg
+local tonumber, next, type = tonumber, next, type
+local format, find, gmatch, match = string.format, string.find, string.gmatch, string.match
+local utfchar, utfbyte = utf.char, utf.byte
+local concat, tohash = table.concat, table.tohash
+local P, C, R, S, V, Cs, Cc = lpeg.P, lpeg.C, lpeg.R, lpeg.S, lpeg.V, lpeg.Cs, lpeg.Cc
+
+local lpegpatterns          = lpeg.patterns
+local lpegmatch             = lpeg.match
+local utfchartabletopattern = lpeg.utfchartabletopattern
+
+local allocate              = utilities.storage.allocate
+local mark                  = utilities.storage.mark
+
+local context               = context
+local commands              = commands
+
+local characters            = characters
+local texcharacters         = { }
+characters.tex              = texcharacters
+local utffilters            = characters.filters.utf
+
+local is_character          = characters.is_character
+local is_letter             = characters.is_letter
+local is_command            = characters.is_command
+local is_spacing            = characters.is_spacing
+local is_mark               = characters.is_mark
+local is_punctuation        = characters.is_punctuation
+
+local data                  = characters.data  if not data then return end
+local blocks                = characters.blocks
+
+local trace_defining        = false  trackers.register("characters.defining", function(v) characters_defining = v end)
+
+local report_defining       = logs.reporter("characters")
+
+--[[ldx--
+<p>In order to deal with 8-bit output, we need to find a way to go from <l n='utf'/> to
+8-bit. This is handled in the <l n='luatex'/> engine itself.</p>
+
+<p>This leaves us problems with characters that are specific to <l n='tex'/> like
+<type>{}</type>, <type>$</type> and alike. We can remap some chars that tex input files
+are sensitive for to a private area (while writing to a utility file) and revert then
+to their original slot when we read in such a file. Instead of reverting, we can (when
+we resolve characters to glyphs) map them to their right glyph there. For this purpose
+we can use the private planes 0x0F0000 and 0x100000.</p>
+--ldx]]--
+
+local low     = allocate()
+local high    = allocate()
+local escapes = allocate()
+local special = "~#$%^&_{}\\|" -- "~#$%{}\\|"
+
+local private = {
+    low     = low,
+    high    = high,
+    escapes = escapes,
+}
+
+utffilters.private = private
+
+for ch in gmatch(special,".") do
+    local cb
+    if type(ch) == "number" then
+        cb, ch = ch, utfchar(ch)
+    else
+        cb = utfbyte(ch)
+    end
+    if cb < 256 then
+        escapes[ch] = "\\" .. ch
+        low[ch] = utfchar(0x0F0000 + cb)
+        if ch == "%" then
+            ch = "%%" -- nasty, but we need this as in replacements (also in lpeg) % is interpreted
+        end
+        high[utfchar(0x0F0000 + cb)] = ch
+    end
+end
+
+local tohigh = lpeg.replacer(low)   -- frozen, only for basic tex
+local tolow  = lpeg.replacer(high)  -- frozen, only for basic tex
+
+lpegpatterns.utftohigh = tohigh
+lpegpatterns.utftolow  = tolow
+
+function utffilters.harden(str)
+    return lpegmatch(tohigh,str)
+end
+
+function utffilters.soften(str)
+    return lpegmatch(tolow,str)
+end
+
+private.escape  = utf.remapper(escapes) -- maybe: ,"dynamic"
+private.replace = utf.remapper(low)     -- maybe: ,"dynamic"
+private.revert  = utf.remapper(high)    -- maybe: ,"dynamic"
+
+--[[ldx--
+<p>We get a more efficient variant of this when we integrate
+replacements in collapser. This more or less renders the previous
+private code redundant. The following code is equivalent but the
+first snippet uses the relocated dollars.</p>
+
+<typing>
+[󰀤x󰀤] [$x$]
+</typing>
+--ldx]]--
+
+-- using the tree-lpeg-mapper would be nice but we also need to deal with end-of-string
+-- cases: "\"\i" and don't want "\relax" to be seen as \r e lax" (for which we need to mess
+-- with spaces
+
+local accentmapping = allocate {
+    ['"'] = { [""] = "¨",
+        A = "Ä", a = "ä",
+        E = "Ë", e = "ë",
+        I = "�", i = "ï", ["ı"] = "ï", ["\\i"] = "ï",
+        O = "Ö", o = "ö",
+        U = "Ü", u = "ü",
+        Y = "Ÿ", y = "ÿ",
+    },
+    ["'"] = { [""] = "´",
+        A = "�", a = "á",
+        C = "Ć", c = "ć",
+        E = "É", e = "é",
+        I = "�", i = "í", ["ı"] = "í", ["\\i"] = "í",
+        L = "Ĺ", l = "ĺ",
+        N = "Ń", n = "ń",
+        O = "Ó", o = "ó",
+        R = "Å”", r = "Å•",
+        S = "Åš", s = "Å›",
+        U = "Ú", u = "ú",
+        Y = "�", y = "ý",
+        Z = "Ź", z = "ź",
+    },
+    ["."] = { [""] = "Ë™",
+        C = "ÄŠ", c = "Ä‹",
+        E = "Ä–", e = "Ä—",
+        G = "Ä ", g = "Ä¡",
+        I = "İ", i = "i", ["ı"] = "i", ["\\i"] = "i",
+        Z = "Ż", z = "ż",
+    },
+    ["="] = { [""] = "¯",
+        A = "Ā", a = "�",
+        E = "Ä’", e = "Ä“",
+        I = "Ī", i = "ī", ["ı"] = "ī", ["\\i"] = "ī",
+        O = "Ō", o = "�",
+        U = "Ū", u = "ū",
+    },
+    ["H"] = { [""] = "�",
+        O = "�", o = "ő",
+        U = "Ű", u = "ű",
+    },
+    ["^"] = { [""] = "ˆ",
+        A = "Â", a = "â",
+        C = "Ĉ", c = "ĉ",
+        E = "Ê", e = "ê",
+        G = "Ĝ", g = "�",
+        H = "Ĥ", h = "ĥ",
+        I = "Î", i = "î", ["ı"] = "î", ["\\i"] = "î",
+        J = "Ĵ", j = "ĵ",
+        O = "Ô", o = "ô",
+        S = "Ŝ", s = "�",
+        U = "Û", u = "û",
+        W = "Ŵ", w = "ŵ",
+        Y = "Ŷ", y = "ŷ",
+    },
+    ["`"] = { [""] = "`",
+        A = "À", a = "à",
+        E = "È", e = "è",
+        I = "Ì", i = "ì", ["ı"] = "ì", ["\\i"] = "ì",
+        O = "Ò", o = "ò",
+        U = "Ù", u = "ù",
+        Y = "Ỳ", y = "ỳ",
+    },
+    ["c"] = { [""] = "¸",
+        C = "Ç", c = "ç",
+        K = "Ķ", k = "ķ",
+        L = "Ļ", l = "ļ",
+        N = "Ņ", n = "ņ",
+        R = "Å–", r = "Å—",
+        S = "Åž", s = "ÅŸ",
+        T = "Å¢", t = "Å£",
+    },
+    ["k"] = { [""] = "Ë›",
+        A = "Ä„", a = "Ä…",
+        E = "Ę", e = "ę",
+        I = "Į", i = "į",
+        U = "Ų", u = "ų",
+    },
+    ["r"] = { [""] = "Ëš",
+        A = "Ã…", a = "Ã¥",
+        U = "Ů", u = "ů",
+    },
+    ["u"] = { [""] = "˘",
+        A = "Ă", a = "ă",
+        E = "Ä”", e = "Ä•",
+        G = "Äž", g = "ÄŸ",
+        I = "Ĭ", i = "ĭ", ["ı"] = "ĭ", ["\\i"] = "ĭ",
+        O = "Ŏ", o = "�",
+        U = "Ŭ", u = "ŭ",
+        },
+    ["v"] = { [""] = "ˇ",
+        C = "Č", c = "�",
+        D = "Ď", d = "�",
+        E = "Äš", e = "Ä›",
+        L = "Ľ", l = "ľ",
+        N = "Ň", n = "ň",
+        R = "Ř", r = "ř",
+        S = "Å ", s = "Å¡",
+        T = "Ť", t = "ť",
+        Z = "Ž", z = "ž",
+        },
+    ["~"] = { [""] = "˜",
+        A = "Ã", a = "ã",
+        I = "Ĩ", i = "ĩ", ["ı"] = "ĩ", ["\\i"] = "ĩ",
+        N = "Ñ", n = "ñ",
+        O = "Õ", o = "õ",
+        U = "Ũ", u = "ũ",
+    },
+}
+
+texcharacters.accentmapping = accentmapping
+
+local accent_map = allocate { -- incomplete
+   ['~'] = "̃" , --  ̃ Ẽ
+   ['"'] = "̈" , --  ̈ Ë
+   ["`"] = "̀" , --  ̀ È
+   ["'"] = "�" , --  � É
+   ["^"] = "̂" , --  ̂ Ê
+    --  Ì„ Ä’
+    --  ̆ Ĕ
+    --  ̇ Ė
+    --  ̉ Ẻ
+    --  ̌ Ě
+    --  � Ȅ
+    --  ̑ Ȇ
+    --  ̣ Ẹ
+    --  ̧ Ȩ
+    --  ̨ Ę
+    --  ̭ Ḙ
+    --  ̰ Ḛ
+}
+
+-- local accents = concat(table.keys(accentmapping)) -- was _map
+
+local function remap_accent(a,c,braced)
+    local m = accentmapping[a]
+    if m then
+        local n = m[c]
+        if n then
+            return n
+        end
+    end
+--     local m = accent_map[a]
+--     if m then
+--         return c .. m
+--     elseif braced then -- or #c > 0
+    if braced then -- or #c > 0
+        return "\\" .. a .. "{" .. c .. "}"
+    else
+        return "\\" .. a .. " " .. c
+    end
+end
+
+local commandmapping = allocate {
+    ["aa"] = "Ã¥", ["AA"] = "â„«",
+    ["ae"] = "æ", ["AE"] = "Æ",
+    ["cc"] = "ç", ["CC"] = "Ç",
+    ["i"]  = "ı", ["j"]  = "ȷ",
+    ["ij"] = "ij", ["IJ"] = "IJ",
+    ["l"]  = "ł", ["L"]  = "�",
+    ["o"]  = "ø", ["O"]  = "Ø",
+    ["oe"] = "Å“", ["OE"] = "Å’",
+    ["sz"] = "ß", ["SZ"] = "SZ", ["ss"] = "ß", ["SS"] = "ß", -- uppercase: ẞ
+}
+
+texcharacters.commandmapping = commandmapping
+
+local ligaturemapping = allocate {
+    ["''"]  = "�",
+    ["``"]  = "“",
+    ["--"]  = "–",
+    ["---"] = "—",
+}
+
+-- Older accent handling code can be found in char-def.lua but in the meantime
+-- we moved on.
+
+local untex
+
+local function toutfpattern()
+    if not untex then
+        local hash = { }
+        for k, v in next, accentmapping do
+            for kk, vv in next, v do
+                if (k >= "a" and k <= "z") or (k >= "A" and k <= "Z") then
+                    hash[ "\\"..k.." "..kk     ] = vv
+                    hash["{\\"..k.." "..kk.."}"] = vv
+                else
+                    hash["\\" ..k     ..kk     ] = vv
+                    hash["{\\"..k     ..kk.."}"] = vv
+                end
+                hash["\\" ..k.."{"..kk.."}" ] = vv
+                hash["{\\"..k.."{"..kk.."}}"] = vv
+            end
+        end
+        for k, v in next, commandmapping do
+            hash["\\"..k.." "] = v
+            hash["{\\"..k.."}"] = v
+            hash["{\\"..k.." }"] = v
+        end
+        for k, v in next, ligaturemapping do
+            hash[k] = v
+        end
+        untex = utfchartabletopattern(hash) / hash
+    end
+    return untex
+end
+
+texcharacters.toutfpattern = toutfpattern
+
+local pattern = nil
+
+local function prepare()
+    pattern = Cs((toutfpattern() + P(1))^0)
+    return pattern
+end
+
+function texcharacters.toutf(str,strip)
+    if str == "" then
+        return str
+    elseif not find(str,"\\",1,true) then
+        return str
+ -- elseif strip then
+    else
+        return lpegmatch(pattern or prepare(),str)
+    end
+end
+
+-- print(texcharacters.toutf([[\~{Z}]],true))
+-- print(texcharacters.toutf([[\'\i]],true))
+-- print(texcharacters.toutf([[\'{\i}]],true))
+-- print(texcharacters.toutf([[\"{e}]],true))
+-- print(texcharacters.toutf([[\" {e}]],true))
+-- print(texcharacters.toutf([[{\"{e}}]],true))
+-- print(texcharacters.toutf([[{\" {e}}]],true))
+-- print(texcharacters.toutf([[{\l}]],true))
+-- print(texcharacters.toutf([[{\l }]],true))
+-- print(texcharacters.toutf([[\v{r}]],true))
+-- print(texcharacters.toutf([[fo{\"o}{\ss}ar]],true))
+-- print(texcharacters.toutf([[H{\'a}n Th\^e\llap{\raise 0.5ex\hbox{\'{\relax}}} Th{\'a}nh]],true))
+
+function texcharacters.safechar(n) -- was characters.safechar
+    local c = data[n]
+    if c and c.contextname then
+        return "\\" .. c.contextname
+    else
+        return utfchar(n)
+    end
+end
+
+if not context or not commands then
+    -- used in e.g. mtx-bibtex
+    return
+end
+
+-- all kind of initializations
+
+if not interfaces then return end
+
+local implement     = interfaces.implement
+
+local tex           = tex
+local texsetlccode  = tex.setlccode
+local texsetsfcode  = tex.setsfcode
+local texsetcatcode = tex.setcatcode
+
+local contextsprint = context.sprint
+local ctxcatcodes   = catcodes.numbers.ctxcatcodes
+
+local texsetmacro   = tokens.setters.macro
+local texsetchar    = tokens.setters.char
+
+function texcharacters.defineaccents()
+    local ctx_dodefineaccentcommand = context.dodefineaccentcommand
+    local ctx_dodefineaccent        = context.dodefineaccent
+    local ctx_dodefinecommand       = context.dodefinecommand
+    for accent, group in next, accentmapping do
+        ctx_dodefineaccentcommand(accent)
+        for character, mapping in next, group do
+            ctx_dodefineaccent(accent,character,mapping)
+        end
+    end
+    for command, mapping in next, commandmapping do
+        ctx_dodefinecommand(command,mapping)
+    end
+end
+
+implement { -- a waste of scanner but consistent
+    name    = "defineaccents",
+    actions = texcharacters.defineaccents
+}
+
+--[[ldx--
+<p>Instead of using a <l n='tex'/> file to define the named glyphs, we
+use the table. After all, we have this information available anyway.</p>
+--ldx]]--
+
+local function to_number(s)
+    local n = tonumber(s)
+    if n then
+        return n
+    end
+    return tonumber(match(s,'^"(.*)$'),16) or 0
+end
+
+implement {
+    name      = "utfchar",
+    actions   = { to_number, utfchar, contextsprint },
+    arguments = "string"
+}
+
+implement {
+    name      = "safechar",
+    actions   = { to_number, texcharacters.safechar, contextsprint },
+    arguments = "string"
+}
+
+implement {
+    name      = "uchar",
+    arguments = { "integer", "integer" },
+    actions   = function(h,l)
+        context(utfchar(h*256+l))
+    end
+}
+
+tex.uprint = commands.utfchar
+
+-- in contect we don't use lc and uc codes (in fact in luatex we should have a hf code)
+-- so at some point we might drop this
+
+-- The following get set at the TeX end:
+
+local forbidden = tohash {
+    0x000A0, -- zs nobreakspace            <self>
+    0x000AD, -- cf softhyphen              <self>
+ -- 0x00600, -- cf arabicnumber            <self>
+ -- 0x00601, -- cf arabicsanah             <self>
+ -- 0x00602, -- cf arabicfootnotemarker    <self>
+ -- 0x00603, -- cf arabicsafha             <self>
+ -- 0x00604, -- cf arabicsamvat            <self>
+ -- 0x00605, -- cf arabicnumberabove       <self>
+ -- 0x0061C, -- cf arabiclettermark        <self>
+ -- 0x006DD, -- cf arabicendofayah         <self>
+ -- 0x008E2, -- cf arabicdisputedendofayah <self>
+    0x02000, -- zs enquad                  <self>
+    0x02001, -- zs emquad                  <self>
+    0x02002, -- zs enspace                 \kern .5\emwidth
+    0x02003, -- zs emspace                 \hskip \emwidth
+    0x02004, -- zs threeperemspace         <self>
+    0x02005, -- zs fourperemspace          <self>
+    0x02006, -- zs sixperemspace           <self>
+    0x02007, -- zs figurespace             <self>
+    0x02008, -- zs punctuationspace        <self>
+    0x02009, -- zs breakablethinspace      <self>
+    0x0200A, -- zs hairspace               <self>
+    0x0200B, -- cf zerowidthspace          <self>
+    0x0200C, -- cf zwnj                    <self>
+    0x0200D, -- cf zwj                     <self>
+    0x0202F, -- zs narrownobreakspace      <self>
+    0x0205F, -- zs medspace                \textormathspace +\medmuskip 2
+ -- 0x03000, -- zs ideographicspace        <self>
+ -- 0x0FEFF, -- cf zerowidthnobreakspace   \penalty \plustenthousand \kern \zeropoint
+}
+
+local csletters = characters.csletters -- also a signal that we have initialized
+local activated = { }
+local sfmode    = "unset" -- unset, traditional, normal
+local block_too = false
+
+directives.register("characters.blockstoo",function(v) block_too = v end)
+
+-- If this is something that is not documentwide and used a lot, then we
+-- need a more clever approach (trivial but not now).
+
+local function setuppersfcodes(v,n)
+    if sfstate ~= "unset" then
+        report_defining("setting uppercase sf codes to %a",n)
+        for u, chr in next, data do
+            if chr.category == "lu" then
+                texsetsfcode(u,n)
+            end
+        end
+    end
+    sfstate = v
+end
+
+directives.register("characters.spaceafteruppercase",function(v)
+    if v == "traditional" then
+        setuppersfcodes(v,999)
+    elseif v == "normal" then
+        setuppersfcodes(v,1000)
+    end
+end)
+
+if not csletters then
+
+    csletters            = allocate()
+    characters.csletters = csletters
+
+    report_defining("setting up character related codes and commands")
+
+    if sfstate == "unset" then
+        sfstate = "traditional"
+    end
+
+    local traditional = sfstate == "traditional"
+
+    for u, chr in next, data do -- will move up
+        local contextname = chr.contextname
+        local category    = chr.category
+        local isletter    = is_letter[category]
+        if contextname then
+            if is_character[category] then
+                if chr.unicodeslot < 128 then
+                    if isletter then
+                        local c = utfchar(u)
+                        csletters[c] = u
+                    end
+                else
+                    local c = utfchar(u)
+                    if isletter and u >= 32 and u <= 65536 then
+                        csletters[c] = u
+                    end
+                end
+                if isletter then
+                    local lc = chr.lccode
+                    local uc = chr.uccode
+                    if not lc then
+                        chr.lccode = u
+                        lc = u
+                    elseif type(lc) == "table" then
+                        lc = u
+                    end
+                    if not uc then
+                        chr.uccode = u
+                        uc = u
+                    elseif type(uc) == "table" then
+                        uc = u
+                    end
+                    texsetlccode(u,lc,uc)
+                    if traditional and category == "lu" then
+                        texsetsfcode(code,999)
+                    end
+                end
+            elseif is_command[category] and not forbidden[u] then
+                -- skip
+            elseif is_mark[category] then
+                texsetlccode(u,u,u) -- for hyphenation
+            end
+        elseif isletter then
+            csletters[utfchar(u)] = u
+            local lc, uc = chr.lccode, chr.uccode
+            if not lc then
+                chr.lccode = u
+                lc = u
+            elseif type(lc) == "table" then
+                lc = u
+            end
+            if not uc then
+                chr.uccode = u
+                uc = u
+            elseif type(uc) == "table" then
+                uc = u
+            end
+            texsetlccode(u,lc,uc)
+            if traditional and category == "lu" then
+                texsetsfcode(code,999)
+            end
+        elseif is_mark[category] then
+            texsetlccode(u,u,u) -- for hyphenation
+        end
+    end
+
+    if blocks_too then
+        -- this slows down format generation by over 10 percent
+        for k, v in next, blocks do
+            if v.catcode == "letter" then
+                local first = v.first
+                local last  = v.last
+                local gaps  = v.gaps
+                if first and last then
+                    for u=first,last do
+                        csletters[utfchar(u)] = u
+                        --
+                     -- texsetlccode(u,u,u) -- self self
+                        --
+                    end
+                end
+                if gaps then
+                    for i=1,#gaps do
+                        local u = gaps[i]
+                        csletters[utfchar(u)] = u
+                        --
+                     -- texsetlccode(u,u,u) -- self self
+                        --
+                    end
+                end
+            end
+        end
+    end
+
+    if storage then
+        storage.register("characters/csletters", csletters, "characters.csletters")
+    end
+
+    function characters.setcharacternames(ctt)
+        for u, chr in next, data do -- will move up
+            local contextname = chr.contextname
+            local category    = chr.category
+            local isletter    = is_letter[category]
+            if contextname then
+                if is_character[category] then
+                    if chr.unicodeslot < 128 then
+                        if isletter then
+                            texsetmacro(contextname,utfchar(u),"immutable")
+                        else
+                            texsetchar(contextname,u,"immutable")
+                        end
+                    else
+                        texsetmacro(contextname,utfchar(u),"immutable")
+                    end
+                elseif is_command[category] and not forbidden[u] then
+                    texsetmacro(contextname,utfchar(u),"immutable")
+                end
+            end
+        end
+    end
+
+else
+    mark(csletters)
+end
+
+lpegpatterns.csletter = utfchartabletopattern(csletters)
+
+-- The engine presets the letters to 11 (always).
+
+function characters.setlettercatcodes(cct)
+    if trace_defining then
+        report_defining("assigning letter catcodes to catcode table %a",cct)
+    end
+    local saved = tex.catcodetable
+    tex.catcodetable = cct
+    texsetcatcode(0x200C,11) -- non-joiner
+    texsetcatcode(0x200D,11) -- joiner
+    for c, u in next, csletters do
+        texsetcatcode(u,11)
+    end
+    tex.catcodetable = saved
+end
+
+function characters.setothercatcodes(cct)
+    if trace_defining then
+        report_defining("assigning other catcodes to catcode table %a",cct)
+    end
+    local saved = tex.catcodetable
+    tex.catcodetable = cct
+    for u=65,90 do
+        texsetcatcode(u,12)
+    end
+    for u=97,122 do
+        texsetcatcode(u,12)
+    end
+    tex.catcodetable = saved
+end
+
+function characters.setactivecatcodes(cct)
+    local saved = tex.catcodetable
+    tex.catcodetable = cct
+    for i=1,#activated do
+        local u = activated[i]
+        texsetcatcode(u,13)
+        if trace_defining then
+            report_defining("character %U (%s) is active in set %a",u,data[u].description,cct)
+        end
+    end
+    tex.catcodetable = saved
+end
+
+--[[ldx--
+<p>Setting the lccodes is also done in a loop over the data table.</p>
+--ldx]]--
+
+implement {
+    name      = "chardescription",
+    arguments = "integer",
+    actions   = function(slot)
+        local d = data[slot]
+        if d then
+            context(d.description)
+        end
+    end,
+}
+
+if characters.setcharacternames then -- only in ini mode
+
+    implement { name = "setlettercatcodes", scope = "private", actions = characters.setlettercatcodes, arguments = "integer" }
+    implement { name = "setothercatcodes",  scope = "private", actions = characters.setothercatcodes,  arguments = "integer" }
+    implement { name = "setactivecatcodes", scope = "private", actions = characters.setactivecatcodes, arguments = "integer" }
+    implement { name = "setcharacternames", scope = "private", actions = characters.setcharacternames, arguments = "integer" }
+
+end
+
+-- experiment (some can move to char-ini.lua)
+
+local function overload(c,u,code,codes)
+    local c = tonumber(c)
+    if not c then
+        return
+    end
+    local u = utilities.parsers.settings_to_array(u)
+    local n = #u
+    if n == 0 then
+        return
+    end
+    local t = nil
+    if n == 1 then
+        t = tonumber(u[1])
+    else
+        t = { }
+        for i=1,n do
+            t[#t+1] = tonumber(u[i])
+        end
+    end
+    if t then
+        data[c][code] = t
+        characters[codes][c] = nil
+    end
+end
+
+interfaces.implement {
+    name      = "overloaduppercase",
+    arguments = "2 strings",
+    actions   = function(c,u)
+        overload(c,u,"uccode","uccodes")
+    end
+}
+
+interfaces.implement {
+    name      = "overloadlowercase",
+    arguments = "2 strings",
+    actions   = function(c,u)
+        overload(c,u,"lccode","lccodes")
+    end
+}
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 298dbc016..c3af4c00f 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.12.10 22:23}
+\newcontextversion{2020.12.15 10:10}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 238271819..39a9490a9 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2020.12.10 22:23}
+\immutable\edef\contextversion{2020.12.15 10:10}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
@@ -97,7 +97,6 @@
 \loadmkxlfile{catc-ini}
 \loadmkxlfile{catc-act}
 \loadmkxlfile{catc-def}
-\loadmkxlfile{catc-ctx}
 \loadmkxlfile{catc-sym}
 
 \loadmkxlfile{toks-ini}
diff --git a/tex/context/base/mkxl/font-fbk.lmt b/tex/context/base/mkxl/font-fbk.lmt
index 0e104aca7..651bca331 100644
--- a/tex/context/base/mkxl/font-fbk.lmt
+++ b/tex/context/base/mkxl/font-fbk.lmt
@@ -189,7 +189,7 @@ local function composecharacters(tfmdata)
                                                     chr_t,
                                                 }
                                             end
-t.depth = a_ury
+                                            t.depth = a_ury
                                         elseif c_ury > a_lly then -- messy test
                                             local dy
                                             if compose then
@@ -220,7 +220,7 @@ t.depth = a_ury
                                             else
                                                 dy = - deltaxheight + extraxheight
                                             end
-t.height = a_ury-dy
+                                            t.height = a_ury-dy
                                             local right = rightcommand[dx+dd]
                                             local down  = downcommand[dy]
                                             if trace_visualize then
@@ -247,7 +247,7 @@ t.height = a_ury-dy
                                                     chr_t,
                                                 }
                                             end
-t.height = a_ury
+                                            t.height = a_ury
                                         end
                                     end
                                 else
@@ -316,31 +316,25 @@ registerotffeature {
     description = 'unicode compat specials to ligatures',
 }
 
-do
+-- We now provide the composer in the helpers namespace (too):
+
+fonts.helpers.composecharacters = composecharacters
+
+-- We keep this just because we have a few demos but there often are other ways to achieve
+-- the same. This code installs the builder into the regular virtual font builder, which
+-- only makes sense as demo. It also shows a bit what the evolution is.
 
-    -- This installs the builder into the regular virtual font builder,
-    -- which only makes sense as demo.
+do
 
     local vf       = handlers.vf
     local commands = vf.combiner.commands
 
     vf.helpers.composecharacters = composecharacters
 
-    commands["compose.trace.enable"] = function()
-        trace_visualize = true
-    end
-
-    commands["compose.trace.disable"] = function()
-        trace_visualize = false
-    end
-
-    commands["compose.force.enable"] = function()
-        force_combining = true
-    end
-
-    commands["compose.force.disable"] = function()
-        force_combining = false
-    end
+    commands["compose.trace.enable"]  = function() trace_visualize = true  end
+    commands["compose.trace.disable"] = function() trace_visualize = false end
+    commands["compose.force.enable"]  = function() force_combining = true  end
+    commands["compose.force.disable"] = function() force_combining = false end
 
     commands["compose.trace.set"] = function(g,v)
         if v[2] == nil then
diff --git a/tex/context/base/mkxl/font-ini.lmt b/tex/context/base/mkxl/font-ini.lmt
new file mode 100644
index 000000000..45e8f9e18
--- /dev/null
+++ b/tex/context/base/mkxl/font-ini.lmt
@@ -0,0 +1,40 @@
+if not modules then modules = { } end modules ['font-ini'] = {
+    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"
+}
+
+--[[ldx--
+<p>Not much is happening here.</p>
+--ldx]]--
+
+local allocate    = utilities.storage.allocate
+local sortedhash  = table.sortedhash
+
+fonts             = fonts or { }
+local fonts       = fonts
+
+local identifiers = allocate()
+
+fonts.hashes      = fonts.hashes     or { identifiers = identifiers }
+fonts.tables      = fonts.tables     or { }
+fonts.helpers     = fonts.helpers    or { }
+fonts.tracers     = fonts.tracers    or { } -- for the moment till we have move to moduledata
+fonts.specifiers  = fonts.specifiers or { } -- in format !
+
+fonts.analyzers   = { } -- not needed here
+fonts.readers     = { }
+fonts.definers    = { methods = { } }
+fonts.loggers     = { register = function() end }
+
+fonts.privateoffsets = {
+    textbase      = 0xF0000, -- used for hidden (opentype features)
+    textextrabase = 0xFD000, -- used for visible by name
+    mathextrabase = 0xFE000, -- used for visible by code
+    mathbase      = 0xFF000, -- used for hidden (virtual math)
+    keepnames     = false,   -- when set to true names are always kept (not for context)
+}
+
+-- Also here now:
diff --git a/tex/context/base/mkxl/font-lib.mklx b/tex/context/base/mkxl/font-lib.mklx
index b6daca3c7..1d7d4d1e5 100644
--- a/tex/context/base/mkxl/font-lib.mklx
+++ b/tex/context/base/mkxl/font-lib.mklx
@@ -15,7 +15,7 @@
 
 \unprotect
 
-\registerctxluafile{font-ini}{}
+\registerctxluafile{font-ini}{autosuffix}
 \registerctxluafile{font-log}{}
 \registerctxluafile{font-con}{autosuffix}
 %registerctxluafile{font-cft}{}
@@ -33,7 +33,8 @@
 \registerctxluafile{font-ttf}{optimize} % cubic outlines
 \registerctxluafile{font-dsp}{optimize} % ... for this one
 \registerctxluafile{font-hsh}{}         % hashes used by context
-\registerctxluafile{font-vfc}{}
+\registerctxluafile{font-vir}{}
+\registerctxluafile{font-vfc}{autosuffix}
 \registerctxluafile{font-prv}{}         % needs hashes
 \registerctxluafile{font-nod}{optimize}
 \registerctxluafile{font-oti}{}         % otf initialization
@@ -81,7 +82,6 @@
 
 \registerctxluafile{font-lua}{}
 
-\registerctxluafile{font-vir}{}
 \registerctxluafile{font-enh}{autosuffix}
 
 \registerctxluafile{good-ini}{}
diff --git a/tex/context/base/mkxl/font-vfc.lmt b/tex/context/base/mkxl/font-vfc.lmt
new file mode 100644
index 000000000..e39eca683
--- /dev/null
+++ b/tex/context/base/mkxl/font-vfc.lmt
@@ -0,0 +1,83 @@
+if not modules then modules = { } end modules ['font-vfc'] = {
+    version   = 1.001,
+    comment   = "companion to font-ini.mkiv and hand-ini.mkiv",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+local select, type = select, type
+local insert = table.insert
+
+local fonts             = fonts
+local helpers           = fonts.helpers
+
+local setmetatableindex = table.setmetatableindex
+----- makeweak          = table.makeweak
+
+-- Helpers dealing with virtual fonts: beware, these are final values so
+-- don't change the content of tables fetched from here!
+
+local push  = { "push" }
+local pop   = { "pop" }
+local dummy = { "comment" }
+
+function helpers.prependcommands(commands,...)
+    insert(commands,1,push)
+    for i=select("#",...),1,-1 do
+        local s = (select(i,...))
+        if s then
+            insert(commands,1,s)
+        end
+    end
+    insert(commands,pop)
+    return commands
+end
+
+function helpers.appendcommands(commands,...)
+    insert(commands,1,push)
+    insert(commands,pop)
+    for i=1,select("#",...) do
+        local s = (select(i,...))
+        if s then
+            insert(commands,s)
+        end
+    end
+    return commands
+end
+
+function helpers.prependcommandtable(commands,t)
+    insert(commands,1,push)
+    for i=#t,1,-1 do
+        local s = t[i]
+        if s then
+            insert(commands,1,s)
+        end
+    end
+    insert(commands,pop)
+    return commands
+end
+
+function helpers.appendcommandtable(commands,t)
+    insert(commands,1,push)
+    insert(commands,pop)
+    for i=1,#t do
+        local s = t[i]
+        if s then
+            insert(commands,s)
+        end
+    end
+    return commands
+end
+
+helpers.commands = utilities.storage.allocate {
+    char  = setmetatableindex(function(t,k) local v = { "slot",   0, k } t[k] = v return v end),
+    right = setmetatableindex(function(t,k) local v = { "right",  k    } t[k] = v return v end),
+    left  = setmetatableindex(function(t,k) local v = { "right", -k    } t[k] = v return v end), -- todo: left
+    down  = setmetatableindex(function(t,k) local v = { "down",   k    } t[k] = v return v end),
+    up    = setmetatableindex(function(t,k) local v = { "down",  -k    } t[k] = v return v end), -- todo: up
+    push  = push,
+    pop   = pop,
+    dummy = dummy,
+}
+
diff --git a/tex/context/base/mkxl/font-vir.lmt b/tex/context/base/mkxl/font-vir.lmt
new file mode 100644
index 000000000..f60639d6a
--- /dev/null
+++ b/tex/context/base/mkxl/font-vir.lmt
@@ -0,0 +1,159 @@
+if not modules then modules = { } end modules ['font-vir'] = {
+    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"
+}
+
+-- This is actually very experimental code but it has been so since we began with
+-- \LUATEX\ so \unknown. We keep it around because it's not that much code and
+-- because we have some demo's (in the test suite) that use it.
+
+local next, setmetatable, getmetatable = next, setmetatable, getmetatable
+
+local allocate          = utilities.storage.allocate
+local setmetatableindex = table.setmetatableindex
+local fastcopy          = table.fastcopy
+
+local fonts             = fonts
+local constructors      = fonts.constructors
+local vf                = constructors.handlers.vf
+vf.version              = 1.000 -- same as tfm
+
+local definers          = fonts.definers
+local methods           = definers.methods
+
+local variants          = allocate()
+local combinations      = { }
+local combiner          = { }
+local whatever          = allocate()
+local helpers           = allocate()
+local predefined        = fonts.helpers.commands
+
+methods.variants        = variants -- todo .. wrong namespace
+vf.combinations         = combinations
+vf.combiner             = combiner
+vf.whatever             = whatever
+vf.helpers              = helpers
+vf.predefined           = predefined
+
+setmetatableindex(whatever, function(t,k) local v = { } t[k] = v return v end)
+
+local function checkparameters(g,f)
+    if f and g and not g.parameters and #g.fonts > 0 then
+        local p = { }
+        for k,v in next, f.parameters do
+            p[k] = v
+        end
+        g.parameters = p
+        setmetatable(p, getmetatable(f.parameters))
+    end
+end
+
+function methods.install(tag, rules)
+    vf.combinations[tag] = rules
+    variants[tag] = function(specification)
+        return vf.combine(specification,tag)
+    end
+end
+
+local function combine_load(g,name)
+    return constructors.readanddefine(name or g.specification.name,g.specification.size)
+end
+
+local function combine_assign(g, name, from, to, start, force)
+    local f, id = combine_load(g,name)
+    if f and id then
+        -- optimize for whole range, then just g = f
+        if not from  then from, to = 0, 0xFF00 end
+        if not to    then to       = from      end
+        if not start then start    = from      end
+        local fc = f.characters
+        local gc = g.characters
+        local fd = f.descriptions
+        local gd = g.descriptions
+        local hn = #g.fonts+1
+        g.fonts[hn] = { id = id } -- no need to be sparse
+        for i=from,to do
+            if fc[i] and (force or not gc[i]) then
+                gc[i] = fastcopy(fc[i],true) -- can be optimized
+                gc[i].commands = { { "slot", hn, start } }
+                gd[i] = fd[i]
+            end
+            start = start + 1
+        end
+        checkparameters(g,f)
+    end
+end
+
+local function combine_process(g,list)
+    if list then
+        for _,v in next, list do
+            (combiner.commands[v[1]] or nop)(g,v)
+        end
+    end
+end
+
+local function combine_names(g,name,force)
+    local f, id = constructors.readanddefine(name,g.specification.size)
+    if f and id then
+        local fc = f.characters
+        local gc = g.characters
+        local fd = f.descriptions
+        local gd = g.descriptions
+        g.fonts[#g.fonts+1] = { id = id } -- no need to be sparse
+        local hn = #g.fonts
+        for k, v in next, fc do
+            if force or not gc[k] then
+                gc[k] = fastcopy(v,true)
+                gc[k].commands = { { "slot", hn, k } }
+                gd[i] = fd[i]
+            end
+        end
+        checkparameters(g,f)
+    end
+end
+
+local combine_feature = function(g,v)
+    local key   = v[2]
+    local value = v[3]
+    if key then
+        if value == nil then
+            value = true
+        end
+        local specification = g.specification
+        if specification then
+            local normalfeatures = specification.features.normal
+            if normalfeatures then
+                normalfeatures[key] = value -- otf?
+            end
+        end
+    end
+end
+
+combiner.commands = allocate {
+    ["initialize"]      = function(g,v) combine_assign    (g,g.properties.name) end,
+    ["include-method"]  = function(g,v) combine_process   (g,combinations[v[2]]) end, -- name
+ -- ["copy-parameters"] = function(g,v) combine_parameters(g,v[2]) end, -- name
+    ["copy-range"]      = function(g,v) combine_assign    (g,v[2],v[3],v[4],v[5],true) end, -- name, from-start, from-end, to-start
+    ["copy-char"]       = function(g,v) combine_assign    (g,v[2],v[3],v[3],v[4],true) end, -- name, from, to
+    ["fallback-range"]  = function(g,v) combine_assign    (g,v[2],v[3],v[4],v[5],false) end, -- name, from-start, from-end, to-start
+    ["fallback-char"]   = function(g,v) combine_assign    (g,v[2],v[3],v[3],v[4],false) end, -- name, from, to
+    ["copy-names"]      = function(g,v) combine_names     (g,v[2],true) end,
+    ["fallback-names"]  = function(g,v) combine_names     (g,v[2],false) end,
+    ["feature"]         =               combine_feature,
+}
+
+function vf.combine(specification,tag)
+    local g = {
+        name          = specification.name,
+        properties    = { },
+        fonts         = { },
+        characters    = { },
+        descriptions  = { },
+        specification = fastcopy(specification),
+    }
+    combine_process(g,combinations[tag])
+    return g
+end
diff --git a/tex/context/base/mkxl/grph-inc.lmt b/tex/context/base/mkxl/grph-inc.lmt
new file mode 100644
index 000000000..4fa562cb8
--- /dev/null
+++ b/tex/context/base/mkxl/grph-inc.lmt
@@ -0,0 +1,2160 @@
+if not modules then modules = { } end modules ['grph-inc'] = {
+    version   = 1.001,
+    comment   = "companion to grph-inc.mkiv",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+-- todo: in pdfe: pdfe.copyappearance(document,objnum)
+--
+-- local im = createimage { filename = fullname }
+-- local on = images.flushobject(im,document.__xrefs__[AP])
+
+-- todo: files are sometimes located twice
+-- todo: empty filename or only suffix always false (not found)
+-- lowercase types
+-- mps tex tmp svg
+-- partly qualified
+-- dimensions
+-- use metatables
+-- figures.boxnumber can go as we now can use names
+-- avoid push
+-- move some to command namespace
+
+--[[
+The ConTeXt figure inclusion mechanisms are among the oldest code
+in ConTeXt and evolved into a complex whole. One reason is that we
+deal with backend in an abstract way. What complicates matters is
+that we deal with internal graphics as well: TeX code, MetaPost code,
+etc. Later on figure databases were introduced, which resulted in
+a plug in model for locating images. On top of that runs a conversion
+mechanism (with caching) and resource logging.
+
+Porting that to Lua is not that trivial because quite some
+status information is kept between al these stages. Of course, image
+reuse also has some price, and so I decided to implement the graphics
+inclusion in several layers: detection, loading, inclusion, etc.
+
+Object sharing and scaling can happen at each stage, depending on the
+way the resource is dealt with.
+
+The TeX-Lua mix is suboptimal. This has to do with the fact that we cannot
+run TeX code from within Lua. Some more functionality will move to Lua.
+]]--
+
+-- todo: store loaded pages per pdf file someplace
+
+local tonumber, tostring, next, unpack = tonumber, tostring, next, unpack
+local format, lower, find, match, gsub = string.format, string.lower, string.find, string.match, string.gsub
+local longtostring = string.longtostring
+local contains = table.contains
+local sortedhash, sortedkeys = table.sortedhash, table.sortedkeys
+local concat, insert, remove = table.concat, table.insert, table.remove
+local todimen = string.todimen
+local collapsepath = file.collapsepath
+local formatters = string.formatters
+local odd = math.odd
+local isfile, isdir, modificationtime = lfs.isfile, lfs.isdir, lfs.modification
+
+local P, R, S, Cc, C, Cs, Ct, lpegmatch = lpeg.P, lpeg.R, lpeg.S, lpeg.Cc, lpeg.C, lpeg.Cs, lpeg.Ct, lpeg.match
+
+local settings_to_array = utilities.parsers.settings_to_array
+local settings_to_hash  = utilities.parsers.settings_to_hash
+local allocate          = utilities.storage.allocate
+local setmetatableindex = table.setmetatableindex
+local replacetemplate   = utilities.templates.replace
+
+local bpfactor          = number.dimenfactors.bp
+
+images                  = images or { }
+local images            = images
+
+local hasscheme         = url.hasscheme
+local urlhashed         = url.hashed
+
+local resolveprefix     = resolvers.resolve
+
+local texgetbox         = tex.getbox
+local texsetbox         = tex.setbox
+
+local hpack             = node.hpack
+
+local new_latelua       = nodes.pool.latelua
+
+local context           = context
+
+local implement         = interfaces.implement
+local variables         = interfaces.variables
+
+local codeinjections    = backends.codeinjections
+local nodeinjections    = backends.nodeinjections
+
+local trace_figures     = false  trackers.register  ("graphics.locating",   function(v) trace_figures    = v end)
+local trace_bases       = false  trackers.register  ("graphics.bases",      function(v) trace_bases      = v end)
+local trace_programs    = false  trackers.register  ("graphics.programs",   function(v) trace_programs   = v end)
+local trace_conversion  = false  trackers.register  ("graphics.conversion", function(v) trace_conversion = v end)
+local trace_inclusion   = false  trackers.register  ("graphics.inclusion",  function(v) trace_inclusion  = v end)
+local trace_usage       = false  trackers.register  ("graphics.usage",      function(v) trace_usage      = v end)
+
+local extra_check       = false  directives.register("graphics.extracheck",    function(v) extra_check    = v end)
+local auto_transform    = true   directives.register("graphics.autotransform", function(v) auto_transform = v end)
+
+local report            = logs.reporter("graphics")
+local report_inclusion  = logs.reporter("graphics","inclusion")
+
+local f_hash_part       = formatters["%s->%s->%s->%s"]
+local f_hash_full       = formatters["%s->%s->%s->%s->%s->%s->%s->%s"]
+
+local v_yes             = variables.yes
+local v_global          = variables["global"]
+local v_local           = variables["local"]
+local v_default         = variables.default
+local v_auto            = variables.auto
+
+local maxdimen          = tex.magicconstants.maxdimen -- 0x3FFFFFFF -- 2^30-1
+
+local ctx_doscalefigure            = context.doscalefigure
+local ctx_relocateexternalfigure   = context.relocateexternalfigure
+local ctx_startfoundexternalfigure = context.startfoundexternalfigure
+local ctx_stopfoundexternalfigure  = context.stopfoundexternalfigure
+local ctx_dosetfigureobject        = context.dosetfigureobject
+local ctx_doboxfigureobject        = context.doboxfigureobject
+
+-- extensions
+
+function checkimage(figure)
+    if figure then
+        local width  = figure.width or 0
+        local height = figure.height or 0
+        if width <= 0 or height <= 0 then
+            report_inclusion("image %a has bad dimensions (%p,%p), discarding",figure.filename or "?",width,height)
+            return false, "bad dimensions"
+        end
+     -- local xres    = figure.xres
+     -- local yres    = figure.yres
+        local changes = false
+        if height > width then
+            if height > maxdimen then
+                figure.height = maxdimen
+                figure.width  = width * maxdimen/height
+                changed       = true
+            end
+        elseif width > maxdimen then
+            figure.width  = maxdimen
+            figure.height = height * maxdimen/width
+            changed       = true
+        end
+        if changed then
+            report_inclusion("limiting natural dimensions of %a, old %p * %p, new %p * %p",
+                figure.filename,width,height,figure.width,figure.height)
+        end
+        if width >= maxdimen or height >= maxdimen then
+            report_inclusion("image %a is too large (%p,%p), discarding",
+                figure.filename,width,height)
+            return false, "dimensions too large"
+        end
+        return figure
+    end
+end
+
+-- This is a bit of abstraction. Fro a while we will follow the luatex image
+-- model.
+
+local imagekeys  = {
+    -- only relevant ones (permitted in luatex)
+    "width", "height", "depth", "bbox",
+    "colordepth", "colorspace",
+    "filename", "filepath", "visiblefilename",
+    "imagetype", "stream",
+    "index", "objnum",
+    "pagebox", "page", "pages",
+    "rotation", "transform",
+    "xsize", "ysize", "xres", "yres",
+}
+
+local imagesizes = {
+    art   = true, bleed = true,  crop = true,
+    media = true, none  = true,  trim = true,
+}
+
+local imagetypes = { [0] =
+    "none",
+    "pdf", "png", "jpg", "jp2", "jbig2",
+    "stream",
+}
+
+imagetypes   = table.swapped(imagetypes,imagetypes)
+
+images.keys  = imagekeys
+images.types = imagetypes
+images.sizes = imagesizes
+
+local function createimage(specification)
+    return backends.codeinjections.newimage(specification)
+end
+
+local function copyimage(specification)
+    return backends.codeinjections.copyimage(specification)
+end
+
+local function scanimage(specification)
+    return backends.codeinjections.scanimage(specification)
+end
+
+local function embedimage(specification)
+    -- write the image to file
+    return backends.codeinjections.embedimage(specification)
+end
+
+local function wrapimage(specification)
+    -- create an image rule
+    return backends.codeinjections.wrapimage(specification)
+end
+
+images.create = createimage
+images.scan   = scanimage
+images.copy   = copyimage
+images.wrap   = wrapimage
+images.embed  = embedimage
+
+-- If really needed we can provide:
+--
+-- img = {
+--     new                  = createimage,
+--     scan                 = scanimage,
+--     copy                 = copyimage,
+--     node                 = wrapimage,
+--     write                = function(specification) context(wrapimage(specification)) end,
+--     immediatewrite       = embedimage,
+--     immediatewriteobject = function() end, -- not upported, experimental anyway
+--     boxes                = function() return sortedkeys(imagesizes) end,
+--     fields               = function() return imagekeys end,
+--     types                = function() return { unpack(imagetypes,0,#imagetypes) } end,
+-- }
+
+-- end of copies / mapping
+
+local function imagetotable(imgtable)
+    if type(imgtable) == "table" then
+        return copy(imgtable)
+    end
+    local result = { }
+    for k=1,#imagekeys do
+        local key   = imagekeys[k]
+        result[key] = imgtable[key]
+    end
+    return result
+end
+
+function images.serialize(i,...)
+    return table.serialize(imagetotable(i),...)
+end
+
+function images.print(i,...)
+    return table.print(imagetotable(i),...)
+end
+
+local function checkimagesize(size)
+    if size then
+        size = gsub(size,"box","")
+        return imagesizes[size] and size or "crop"
+    else
+        return "crop"
+    end
+end
+
+images.check     = checkimage
+images.checksize = checkimagesize
+images.totable   = imagetotable
+
+-- local indexed = { }
+--
+-- function images.ofindex(n)
+--     return indexed[n]
+-- end
+
+--- we can consider an grph-ini file
+
+figures                 = figures or { }
+local figures           = figures
+
+figures.images          = images
+figures.boxnumber       = figures.boxnumber or 0
+figures.defaultsearch   = true
+figures.defaultwidth    = 0
+figures.defaultheight   = 0
+figures.defaultdepth    = 0
+figures.nofprocessed    = 0
+figures.nofmissing      = 0
+figures.preferquality   = true -- quality over location
+
+local figures_loaded    = allocate()   figures.loaded      = figures_loaded
+local figures_used      = allocate()   figures.used        = figures_used
+local figures_found     = allocate()   figures.found       = figures_found
+local figures_suffixes  = allocate()   figures.suffixes    = figures_suffixes
+local figures_patterns  = allocate()   figures.patterns    = figures_patterns
+local figures_resources = allocate()   figures.resources   = figures_resources
+
+local existers          = allocate()   figures.existers    = existers
+local checkers          = allocate()   figures.checkers    = checkers
+local includers         = allocate()   figures.includers   = includers
+local remappers         = allocate()   figures.remappers   = remappers
+local converters        = allocate()   figures.converters  = converters
+local identifiers       = allocate()   figures.identifiers = identifiers
+local programs          = allocate()   figures.programs    = programs
+
+local defaultformat     = "pdf"
+local defaultprefix     = "m_k_i_v_"
+
+figures.localpaths = allocate {
+    ".", "..", "../.."
+}
+
+figures.cachepaths = allocate {
+    prefix  = "",
+    path    = ".",
+    subpath = ".",
+}
+
+local figure_paths = allocate(table.copy(figures.localpaths))
+figures.paths      = figure_paths
+
+local figures_order =  allocate {
+    "pdf", "mps", "jpg", "png", "jp2", "jbig", "svg", "eps", "tif", "gif", "mov", "buffer", "tex", "cld", "auto",
+}
+
+local figures_formats = allocate { -- magic and order will move here
+    ["pdf"]    = { list = { "pdf" } },
+    ["mps"]    = { patterns = { "^mps$", "^%d+$" } }, -- we need to anchor
+    ["jpg"]    = { list = { "jpg", "jpeg" } },
+    ["png"]    = { list = { "png" } },
+    ["jp2"]    = { list = { "jp2" } },
+    ["jbig"]   = { list = { "jbig", "jbig2", "jb2" } },
+    ["svg"]    = { list = { "svg", "svgz" } },
+    ["eps"]    = { list = { "eps", "ai" } },
+    ["gif"]    = { list = { "gif" } },
+    ["tif"]    = { list = { "tif", "tiff" } },
+    ["mov"]    = { list = { "mov", "flv", "mp4" } }, -- "avi" is not supported
+    ["buffer"] = { list = { "tmp", "buffer", "buf" } },
+    ["tex"]    = { list = { "tex" } },
+    ["cld"]    = { list = { "cld" } },
+    ["auto"]   = { list = { "auto" } },
+}
+
+local figures_magics = allocate {
+    { format = "png", pattern = P("\137PNG\013\010\026\010") },                   -- 89 50 4E 47 0D 0A 1A 0A,
+    { format = "jpg", pattern = P("\255\216\255") },                              -- FF D8 FF
+    { format = "jp2", pattern = P("\000\000\000\012\106\080\032\032\013\010"), }, -- 00 00 00 0C 6A 50 20 20 0D 0A },
+    { format = "gif", pattern = P("GIF") },
+    { format = "pdf", pattern = (1 - P("%PDF"))^0 * P("%PDF") },
+}
+
+local figures_native = allocate {
+    pdf = true,
+    jpg = true,
+    jp2 = true,
+    png = true,
+}
+
+figures.formats = figures_formats -- frozen
+figures.magics  = figures_magics  -- frozen
+figures.order   = figures_order   -- frozen
+
+-- name checker
+
+local okay = P("m_k_i_v_")
+
+local pattern = (R("az","AZ") * P(":"))^-1 * (                                      -- a-z : | A-Z :
+    (okay + R("az","09") + S("_/") - P("_")^2)^1 * (P(".") * R("az")^1)^0 * P(-1) + -- a-z | single _ | /
+    (okay + R("az","09") + S("-/") - P("-")^2)^1 * (P(".") * R("az")^1)^0 * P(-1) + -- a-z | single - | /
+    (okay + R("AZ","09") + S("_/") - P("_")^2)^1 * (P(".") * R("AZ")^1)^0 * P(-1) + -- A-Z | single _ | /
+    (okay + R("AZ","09") + S("-/") - P("-")^2)^1 * (P(".") * R("AZ")^1)^0 * P(-1)   -- A-Z | single - | /
+) * Cc(false) + Cc(true)
+
+function figures.badname(name)
+    if not name then
+        -- bad anyway
+    elseif not hasscheme(name) then
+        return lpegmatch(pattern,name)
+    else
+        return lpegmatch(pattern,file.basename(name))
+    end
+end
+
+logs.registerfinalactions(function()
+    local done = false
+    if trace_usage and figures.nofprocessed > 0 then
+        logs.startfilelogging(report,"names")
+        for _, data in sortedhash(figures_found) do
+            if done then
+                report()
+            else
+                done = true
+            end
+            report("asked   : %s",data.askedname)
+            if data.found then
+                report("format  : %s",data.format)
+                report("found   : %s",data.foundname)
+                report("used    : %s",data.fullname)
+                if data.badname then
+                    report("comment : %s","bad name")
+                elseif data.comment then
+                    report("comment : %s",data.comment)
+                end
+            else
+                report("comment : %s","not found")
+            end
+        end
+        logs.stopfilelogging()
+    end
+    if figures.nofmissing > 0 and logs.loggingerrors() then
+        logs.starterrorlogging(report,"missing figures")
+        for _, data in sortedhash(figures_found) do
+            report("%w%s",6,data.askedname)
+        end
+        logs.stoperrorlogging()
+    end
+end)
+
+-- We can set the order but only indirectly so that we can check for support.
+
+function figures.setorder(list) -- can be table or string
+    if type(list) == "string" then
+        list = settings_to_array(list)
+    end
+    if list and #list > 0 then
+        figures_order = allocate()
+        figures.order = figures_order
+        local done = { } -- just to be sure in case the list is generated
+        for i=1,#list do
+            local l = lower(list[i])
+            if figures_formats[l] and not done[l] then
+                figures_order[#figures_order+1] = l
+                done[l] = true
+            end
+        end
+        report_inclusion("lookup order % a",figures_order)
+    else
+        -- invalid list
+    end
+end
+
+local function guessfromstring(str)
+    if str then
+        for i=1,#figures_magics do
+            local pattern = figures_magics[i]
+            if lpegmatch(pattern.pattern,str) then
+                local format = pattern.format
+                if trace_figures then
+                    report_inclusion("file %a has format %a",filename,format)
+                end
+                return format
+            end
+        end
+    end
+end
+
+figures.guessfromstring = guessfromstring
+
+function figures.guess(filename)
+    local f = io.open(filename,'rb')
+    if f then
+        local str = f:read(100)
+        f:close()
+        if str then
+            return guessfromstring(str)
+        end
+    end
+end
+
+local function setlookups() -- tobe redone .. just set locals
+    figures_suffixes = allocate()
+    figures_patterns = allocate()
+    for _, format in next, figures_order do
+        local data = figures_formats[format]
+        local list = data.list
+        if list then
+            for i=1,#list do
+                figures_suffixes[list[i]] = format -- hash
+            end
+        else
+            figures_suffixes[format] = format
+        end
+        local patterns = data.patterns
+        if patterns then
+            for i=1,#patterns do
+                figures_patterns[#figures_patterns+1] = { patterns[i], format } -- array
+            end
+        end
+    end
+    figures.suffixes = figures_suffixes
+    figures.patterns = figures_patterns
+end
+
+setlookups()
+
+figures.setlookups = setlookups
+
+function figures.registerresource(t)
+    local n = #figures_resources + 1
+    figures_resources[n] = t
+    return n
+end
+
+local function register(tag,what,target)
+    local data = figures_formats[target] -- resolver etc
+    if not data then
+        data = { }
+        figures_formats[target] = data
+    end
+    local d = data[tag] -- list or pattern
+    if d and not contains(d,what) then
+        d[#d+1] = what -- suffix or patternspec
+    else
+        data[tag] = { what }
+    end
+    if not contains(figures_order,target) then
+        figures_order[#figures_order+1] = target
+    end
+    setlookups()
+end
+
+function figures.registersuffix (suffix, target) register('list',suffix,target) end
+function figures.registerpattern(pattern,target) register('pattern',pattern,target) end
+
+implement { name = "registerfiguresuffix",  actions = register, arguments = { "'list'",    "string", "string" } }
+implement { name = "registerfigurepattern", actions = register, arguments = { "'pattern'", "string", "string" } }
+
+local last_locationset = last_locationset or nil
+local last_pathlist    = last_pathlist    or nil
+
+function figures.setpaths(locationset,pathlist)
+    if last_locationset == locationset and last_pathlist == pathlist then
+        -- this function can be called each graphic so we provide this optimization
+        return
+    end
+    local t, h = figure_paths, settings_to_hash(locationset)
+    if last_locationset ~= locationset then
+        -- change == reset (actually, a 'reset' would indeed reset
+        if h[v_local] then
+            t = table.fastcopy(figures.localpaths or { })
+        else
+            t = { }
+        end
+        figures.defaultsearch = h[v_default]
+        last_locationset = locationset
+    end
+    if h[v_global] then
+        local list = settings_to_array(pathlist)
+        for i=1,#list do
+            local s = list[i]
+            if not contains(t,s) then
+                t[#t+1] = s
+            end
+        end
+    end
+    figure_paths  = t
+    last_pathlist = pathlist
+    figures.paths = figure_paths
+    if trace_figures then
+        report_inclusion("using locations %a",last_locationset)
+        report_inclusion("using paths % a",figure_paths)
+    end
+end
+
+implement { name = "setfigurepaths", actions = figures.setpaths, arguments = "2 strings" }
+
+-- check conversions and handle it here
+
+function figures.hash(data)
+    local status = data and data.status
+    return (status and status.hash or tostring(status.private)) or "nohash" -- the <img object>
+end
+
+-- interfacing to tex
+
+local function new() -- we could use metatables status -> used -> request but it needs testing
+    local request = {
+        name       = false,
+        label      = false,
+        format     = false,
+        page       = false,
+        width      = false,
+        height     = false,
+        preview    = false,
+        ["repeat"] = false,
+        controls   = false,
+        display    = false,
+        mask       = false,
+        conversion = false,
+        resolution = false,
+        color      = false,
+        arguments  = false,
+        cache      = false,
+        prefix     = false,
+        size       = false,
+    }
+    local used = {
+        fullname   = false,
+        format     = false,
+        name       = false,
+        path       = false,
+        suffix     = false,
+        width      = false,
+        height     = false,
+    }
+    local status = {
+        status     = 0,
+        converted  = false,
+        cached     = false,
+        fullname   = false,
+        format     = false,
+    }
+    -- this needs checking because we might check for nil, the test case
+    -- is getfiguredimensions which then should return ~= 0
+ -- setmetatableindex(status, used)
+ -- setmetatableindex(used, request)
+    return {
+        request = request,
+        used    = used,
+        status  = status,
+    }
+end
+
+-- use table.insert|remove
+
+local lastfiguredata = nil -- will be topofstack or last so no { } (else problems with getfiguredimensions)
+local callstack      = { }
+
+function figures.initialize(request)
+    local figuredata = new()
+    if request then
+        -- request.width/height are strings and are only used when no natural dimensions
+        -- can be determined; at some point the handlers might set them to numbers instead
+        local w = tonumber(request.width) or 0
+        local h = tonumber(request.height) or 0
+        local p = tonumber(request.page) or 0
+        request.width  = w > 0 and w or nil
+        request.height = h > 0 and h or nil
+        --
+        request.page      = p > 0 and p or 1
+        request.keepopen  = p > 0
+        request.size      = checkimagesize(request.size)
+        request.object    = request.object == v_yes
+        request["repeat"] = request["repeat"] == v_yes
+        request.preview   = request.preview == v_yes
+        request.cache     = request.cache ~= "" and request.cache
+        request.prefix    = request.prefix ~= "" and request.prefix
+        request.format    = request.format ~= "" and request.format
+        request.compact   = request.compact == v_yes
+        table.merge(figuredata.request,request)
+    end
+    return figuredata
+end
+
+function figures.push(request)
+    statistics.starttiming(figures)
+    local figuredata = figures.initialize(request) -- we could use table.sparse but we set them later anyway
+    insert(callstack,figuredata)
+    lastfiguredata = figuredata
+    return figuredata
+end
+
+function figures.pop()
+    remove(callstack)
+    lastfiguredata = callstack[#callstack] or lastfiguredata
+    statistics.stoptiming(figures)
+end
+
+function figures.current()
+    return callstack[#callstack] or lastfiguredata
+end
+
+local function get(category,tag,default)
+    local value = lastfiguredata and lastfiguredata[category]
+    value = value and value[tag]
+    if not value or value == "" or value == true then
+        return default or ""
+    else
+        return value
+    end
+end
+
+local function setdimensions(box)
+    local status = lastfiguredata and lastfiguredata.status
+    local used   = lastfiguredata and lastfiguredata.used
+    if status and used then
+        local b = texgetbox(box)
+        local w = b.width
+        local h = b.height + b.depth
+        status.width  = w
+        status.height = h
+        used.width    = w
+        used.height   = h
+        status.status = 10
+    end
+end
+
+figures.get = get
+figures.set = setdimensions
+
+implement { name = "figurestatus",   actions = { get, context }, arguments = { "'status'",  "string", "string" } }
+implement { name = "figurerequest",  actions = { get, context }, arguments = { "'request'", "string", "string" } }
+implement { name = "figureused",     actions = { get, context }, arguments = { "'used'",    "string", "string" } }
+
+implement { name = "figurefilepath", public = true, actions = { get, file.dirname,  context }, arguments = { "'used'", "'fullname'" } }
+implement { name = "figurefilename", public = true, actions = { get, file.nameonly, context }, arguments = { "'used'", "'fullname'" } }
+implement { name = "figurefiletype", public = true, actions = { get, file.extname,  context }, arguments = { "'used'", "'fullname'" } }
+
+implement { name = "figuresetdimensions", actions = setdimensions, arguments = "integer" }
+
+-- todo: local path or cache path
+
+local function forbiddenname(filename)
+    if not filename or filename == "" then
+        return false
+    end
+    local expandedfullname = collapsepath(filename,true)
+    local expandedinputname = collapsepath(file.addsuffix(environment.jobfilename,environment.jobfilesuffix),true)
+    if expandedfullname == expandedinputname then
+        report_inclusion("skipping graphic with same name as input filename %a, enforce suffix",expandedinputname)
+        return true
+    end
+    local expandedoutputname = collapsepath(codeinjections.getoutputfilename(),true)
+    if expandedfullname == expandedoutputname then
+        report_inclusion("skipping graphic with same name as output filename %a, enforce suffix",expandedoutputname)
+        return true
+    end
+end
+
+local function rejected(specification)
+    if extra_check then
+        local fullname = specification.fullname
+        if fullname and figures_native[file.suffix(fullname)] and not figures.guess(fullname) then
+            specification.comment = "probably a bad file"
+            specification.found   = false
+            specification.error   = true
+            report_inclusion("file %a looks bad",fullname)
+            return true
+        end
+    end
+end
+
+local function wipe(str)
+    if str == "" or str == "default" or str == "unknown" then
+        return nil
+    else
+        return str
+    end
+end
+
+local function register(askedname,specification)
+    if not specification then
+        specification = { askedname = askedname, comment = "invalid specification" }
+    elseif forbiddenname(specification.fullname) then
+        specification = { askedname = askedname, comment = "forbidden name" }
+    elseif specification.internal then
+        -- no filecheck needed
+        specification.found = true
+        if trace_figures then
+            report_inclusion("format %a internally supported by engine",specification.format)
+        end
+    elseif not rejected(specification) then
+        local format = specification.format
+        if format then
+            local conversion = wipe(specification.conversion)
+            local resolution = wipe(specification.resolution)
+            local arguments  = wipe(specification.arguments)
+            local newformat  = conversion
+            if not newformat or newformat == "" then
+                newformat = defaultformat
+            end
+            if trace_conversion then
+                report_inclusion("checking conversion of %a, fullname %a, old format %a, new format %a, conversion %a, resolution %a, arguments %a",
+                    askedname,
+                    specification.fullname,
+                    format,
+                    newformat,
+                    conversion or "default",
+                    resolution or "default",
+                    arguments  or ""
+                )
+            end
+            -- begin of quick hack
+            local remapper = remappers[format]
+            if remapper then
+                remapper = remapper[conversion]
+                if remapper then
+                    specification = remapper(specification) or specification
+                    format        = specification.format
+                    newformat     = format
+                    conversion    = nil
+                end
+            end
+            -- end of quick hack
+            local converter = (not remapper) and (newformat ~= format or resolution or arguments) and converters[format]
+            if converter then
+                local okay = converter[newformat]
+                if okay then
+                    converter = okay
+                else
+                    newformat = defaultformat
+                    converter = converter[newformat]
+                end
+            elseif trace_conversion then
+                report_inclusion("no converter for %a to %a",format,newformat)
+            end
+            if converter then
+                -- todo: make this a function
+                --
+                -- todo: outline as helper function
+                --
+                local oldname = specification.fullname
+                local newpath = file.dirname(oldname)
+                local oldbase = file.basename(oldname)
+                --
+                -- problem: we can have weird filenames, like a.b.c (no suffix) and a.b.c.gif
+                -- so we cannot safely remove a suffix (unless we do that for known suffixes)
+                --
+                -- local newbase = file.removesuffix(oldbase) -- assumes a known suffix
+                --
+                -- so we now have (also see *):
+                --
+                local newbase = oldbase
+                --
+                local fc = specification.cache or figures.cachepaths.path
+                if fc and fc ~= "" and fc ~= "." then
+                    newpath = gsub(fc,"%*",newpath) -- so cachedir can be "/data/cache/*"
+                else
+                    newbase = defaultprefix .. newbase
+                end
+                local subpath = specification.subpath or figures.cachepaths.subpath
+                if subpath and subpath ~= "" and subpath ~= "."  then
+                    newpath = newpath .. "/" .. subpath
+                end
+                if not isdir(newpath) then
+                    dir.makedirs(newpath)
+                    if not file.is_writable(newpath) then
+                        if trace_conversion then
+                            report_inclusion("path %a is not writable, forcing conversion path %a",newpath,".")
+                        end
+                        newpath = "."
+                    end
+                end
+                local prefix = specification.prefix or figures.cachepaths.prefix
+                if prefix and prefix ~= "" then
+                    newbase = prefix .. newbase
+                end
+                local hash = ""
+                if resolution then
+                    hash = hash .. "[r:" .. resolution .. "]"
+                end
+                if arguments then
+                    hash = hash .. "[a:" .. arguments .. "]"
+                end
+                if hash ~= "" then
+                    newbase = newbase .. "_" .. md5.hex(hash)
+                end
+                --
+                -- see *, we had:
+                --
+                -- local newbase = file.addsuffix(newbase,newformat)
+                --
+                -- but now have (result of Aditya's web image testing):
+                --
+                -- as a side effect we can now have multiple fetches with different
+                -- original figures_formats, not that it matters much (apart from older conversions
+                -- sticking around)
+                --
+                local newbase = newbase .. "." .. newformat
+                local newname = file.join(newpath,newbase)
+                oldname = collapsepath(oldname)
+                newname = collapsepath(newname)
+                local oldtime = modificationtime(oldname) or 0
+                local newtime = modificationtime(newname) or 0
+                if newtime == 0 or oldtime > newtime then
+                    if trace_conversion then
+                        report_inclusion("converting %a (%a) from %a to %a",askedname,oldname,format,newformat)
+                    end
+                    converter(oldname,newname,resolution or "", arguments or "")
+                else
+                    if trace_conversion then
+                        report_inclusion("no need to convert %a (%a) from %a to %a",askedname,oldname,format,newformat)
+                    end
+                end
+                if io.exists(newname) and io.size(newname) > 0 then
+                    specification.foundname = oldname
+                    specification.fullname  = newname
+                    specification.prefix    = prefix
+                    specification.subpath   = subpath
+                    specification.converted = true
+                    format = newformat
+                    if not figures_suffixes[format] then
+                        -- maybe the new format is lowres.png (saves entry in suffixes)
+                        -- so let's do this extra check
+                        local suffix = file.suffix(newformat)
+                        if figures_suffixes[suffix] then
+                            if trace_figures then
+                                report_inclusion("using suffix %a as format for %a",suffix,format)
+                            end
+                            format = suffix
+                        end
+                    end
+                    specification.format = format
+                elseif io.exists(oldname) then
+                    report_inclusion("file %a is bugged",oldname)
+                    if format and imagetypes[format] then
+                        specification.fullname = oldname
+                    end
+                    specification.converted = false
+                    specification.bugged    = true
+                end
+            end
+        end
+        if format then
+            local found = figures_suffixes[format]
+            if not found then
+                specification.found = false
+                if trace_figures then
+                    report_inclusion("format %a is not supported",format)
+                end
+            elseif imagetypes[format] then
+                specification.found = true
+                if trace_figures then
+                    report_inclusion("format %a natively supported by backend",format)
+                end
+            else
+                specification.found = true -- else no foo.1 mps conversion
+                if trace_figures then
+                    report_inclusion("format %a supported by output file format",format)
+                end
+            end
+        else
+            specification.askedname = askedname
+            specification.found     = false
+        end
+    end
+    if specification.found then
+        specification.foundname = specification.foundname or specification.fullname
+    else
+        specification.foundname = nil
+    end
+    specification.badname   = figures.badname(askedname)
+    local askedhash = f_hash_part(
+        askedname,
+        specification.conversion or "default",
+        specification.resolution or "default",
+        specification.arguments  or ""
+    )
+    figures_found[askedhash] = specification
+    if not specification.found then
+        figures.nofmissing = figures.nofmissing + 1
+    end
+    return specification
+end
+
+local resolve_too = false -- true
+
+local internalschemes = {
+    file    = true,
+    tree    = true,
+    dirfile = true,
+    dirtree = true,
+}
+
+local function locate(request) -- name, format, cache
+    -- not resolvers.cleanpath(request.name) as it fails on a!b.pdf and b~c.pdf
+    -- todo: more restricted cleanpath
+    local askedname       = request.name or ""
+    local askedcache      = request.cache
+    local askedconversion = request.conversion
+    local askedresolution = request.resolution
+    local askedarguments  = request.arguments
+    local askedhash       = f_hash_part(
+        askedname,
+        askedconversion or "default",
+        askedresolution or "default",
+        askedarguments  or ""
+    )
+    local foundname       = figures_found[askedhash]
+    if foundname then
+        return foundname
+    end
+    --
+    --
+    local askedformat = request.format
+    if not askedformat or askedformat == "" or askedformat == "unknown" then
+        askedformat = file.suffix(askedname) or ""
+    elseif askedformat == v_auto then
+        if trace_figures then
+            report_inclusion("ignoring suffix of %a",askedname)
+        end
+        askedformat = ""
+        askedname   = file.removesuffix(askedname)
+    end
+    -- protocol check
+    local hashed = urlhashed(askedname)
+    if not hashed then
+        -- go on
+    elseif internalschemes[hashed.scheme] then
+        local path = hashed.path
+        if path and path ~= "" then
+            askedname = path
+        end
+    else
+        local foundname = resolvers.findbinfile(askedname)
+        if not foundname or not isfile(foundname) then -- foundname can be dummy
+            if trace_figures then
+                report_inclusion("unknown url %a",askedname)
+            end
+            -- url not found
+            return register(askedname)
+        end
+        local guessedformat = figures.guess(foundname)
+        if askedformat ~= guessedformat then
+            if trace_figures then
+                report_inclusion("url %a has unknown format",askedname)
+            end
+            -- url found, but wrong format
+            return register(askedname)
+        else
+            if trace_figures then
+                report_inclusion("url %a is resolved to %a",askedname,foundname)
+            end
+            return register(askedname, {
+                askedname  = askedname,
+                fullname   = foundname,
+                format     = askedformat,
+                cache      = askedcache,
+                conversion = askedconversion,
+                resolution = askedresolution,
+                arguments  = askedarguments,
+            })
+        end
+    end
+    -- we could use the hashed data instead
+    local askedpath = file.is_rootbased_path(askedname)
+    local askedbase = file.basename(askedname)
+    if askedformat ~= "" then
+        askedformat = lower(askedformat)
+        if trace_figures then
+            report_inclusion("forcing format %a",askedformat)
+        end
+        local format = figures_suffixes[askedformat]
+        if not format then
+            for i=1,#figures_patterns do
+                local pattern = figures_patterns[i]
+                if find(askedformat,pattern[1]) then
+                    format = pattern[2]
+                    if trace_figures then
+                        report_inclusion("asked format %a matches %a",askedformat,pattern[1])
+                    end
+                    break
+                end
+            end
+        end
+        if format then
+            local foundname, quitscanning, forcedformat, internal = figures.exists(askedname,format,resolve_too) -- not askedformat
+            if foundname then
+                return register(askedname, {
+                    askedname  = askedname,
+                    fullname   = foundname, -- askedname,
+                    format     = forcedformat or format,
+                    cache      = askedcache,
+                 -- foundname  = foundname, -- no
+                    conversion = askedconversion,
+                    resolution = askedresolution,
+                    arguments  = askedarguments,
+                    internal   = internal,
+                })
+            elseif quitscanning then
+                return register(askedname)
+            end
+            askedformat = format -- new per 2013-08-05
+        elseif trace_figures then
+            report_inclusion("unknown format %a",askedformat)
+        end
+        if askedpath then
+            -- path and type given, todo: strip pieces of path
+            local foundname, quitscanning, forcedformat = figures.exists(askedname,askedformat,resolve_too)
+            if foundname then
+                return register(askedname, {
+                    askedname  = askedname,
+                    fullname   = foundname, -- askedname,
+                    format     = forcedformat or askedformat,
+                    cache      = askedcache,
+                    conversion = askedconversion,
+                    resolution = askedresolution,
+                    arguments  = askedarguments,
+                })
+            end
+        else
+            -- type given
+            for i=1,#figure_paths do
+                local path = resolveprefix(figure_paths[i]) -- we resolve (e.g. jobfile:)
+                local check = path .. "/" .. askedname
+             -- we pass 'true' as it can be an url as well, as the type
+             -- is given we don't waste much time
+                local foundname, quitscanning, forcedformat = figures.exists(check,askedformat,resolve_too)
+                if foundname then
+                    return register(check, {
+                        askedname  = askedname,
+                        fullname   = foundname, -- check,
+                        format     = askedformat,
+                        cache      = askedcache,
+                        conversion = askedconversion,
+                        resolution = askedresolution,
+                        arguments  = askedarguments,
+                    })
+                end
+            end
+            if figures.defaultsearch then
+                local check = resolvers.findfile(askedname)
+                if check and check ~= "" then
+                    return register(askedname, {
+                        askedname  = askedname,
+                        fullname   = check,
+                        format     = askedformat,
+                        cache      = askedcache,
+                        conversion = askedconversion,
+                        resolution = askedresolution,
+                        arguments  = askedarguments,
+                    })
+                end
+            end
+        end
+    elseif askedpath then
+        if trace_figures then
+            report_inclusion("using rootbased path")
+        end
+        for i=1,#figures_order do
+            local format = figures_order[i]
+            local list = figures_formats[format].list or { format }
+            for j=1,#list do
+                local suffix = list[j]
+                local check = file.addsuffix(askedname,suffix)
+                local foundname, quitscanning, forcedformat = figures.exists(check,format,resolve_too)
+                if foundname then
+                    return register(askedname, {
+                        askedname  = askedname,
+                        fullname   = foundname, -- check,
+                        format     = forcedformat or format,
+                        cache      = askedcache,
+                        conversion = askedconversion,
+                        resolution = askedresolution,
+                        arguments  = askedarguments,
+                    })
+                end
+            end
+        end
+    else
+        if figures.preferquality then
+            if trace_figures then
+                report_inclusion("unknown format, quality preferred")
+            end
+            for j=1,#figures_order do
+                local format = figures_order[j]
+                local list = figures_formats[format].list or { format }
+                for k=1,#list do
+                    local suffix = list[k]
+                 -- local name = file.replacesuffix(askedbase,suffix)
+                    local name = file.replacesuffix(askedname,suffix)
+                    for i=1,#figure_paths do
+                        local path = resolveprefix(figure_paths[i]) -- we resolve (e.g. jobfile:)
+                        local check = path .. "/" .. name
+                        local isfile = internalschemes[urlhashed(check).scheme]
+                        if not isfile then
+                            if trace_figures then
+                                report_inclusion("warning: skipping path %a",path)
+                            end
+                        else
+                            local foundname, quitscanning, forcedformat = figures.exists(check,format,resolve_too) -- true)
+                            if foundname then
+                                return register(askedname, {
+                                    askedname  = askedname,
+                                    fullname   = foundname, -- check
+                                    format     = forcedformat or format,
+                                    cache      = askedcache,
+                                    conversion = askedconversion,
+                                    resolution = askedresolution,
+                                    arguments  = askedarguments
+                                })
+                            end
+                        end
+                    end
+                end
+            end
+        else -- 'location'
+            if trace_figures then
+                report_inclusion("unknown format, using path strategy")
+            end
+            for i=1,#figure_paths do
+                local path = resolveprefix(figure_paths[i]) -- we resolve (e.g. jobfile:)
+                for j=1,#figures_order do
+                    local format = figures_order[j]
+                    local list = figures_formats[format].list or { format }
+                    for k=1,#list do
+                        local suffix = list[k]
+                        local check = path .. "/" .. file.replacesuffix(askedbase,suffix)
+                        local foundname, quitscanning, forcedformat = figures.exists(check,format,resolve_too)
+                        if foundname then
+                            return register(askedname, {
+                                askedname  = askedname,
+                                fullname   = foudname, -- check,
+                                format     = forcedformat or format,
+                                cache      = askedcache,
+                                conversion = askedconversion,
+                                resolution = askedresolution,
+                                arguments  = askedarguments,
+                            })
+                        end
+                    end
+                end
+            end
+        end
+        if figures.defaultsearch then
+            if trace_figures then
+                report_inclusion("using default tex path")
+            end
+            for j=1,#figures_order do
+                local format = figures_order[j]
+                local list = figures_formats[format].list or { format }
+                for k=1,#list do
+                    local suffix = list[k]
+                    local check = resolvers.findfile(file.replacesuffix(askedname,suffix))
+                    if check and check ~= "" then
+                        return register(askedname, {
+                            askedname  = askedname,
+                            fullname   = check,
+                            format     = format,
+                            cache      = askedcache,
+                            conversion = askedconversion,
+                            resolution = askedresolution,
+                            arguments  = askedarguments,
+                        })
+                    end
+                end
+            end
+        end
+    end
+    return register(askedname, { -- these two are needed for hashing 'found'
+        conversion = askedconversion,
+        resolution = askedresolution,
+        arguments  = askedarguments,
+    })
+end
+
+-- -- -- plugins -- -- --
+
+function identifiers.default(data)
+    local dr, du, ds = data.request, data.used, data.status
+    local l = locate(dr)
+    local foundname = l.foundname
+    local fullname  = l.fullname or foundname
+    if fullname then
+        du.format   = l.format or false
+        du.fullname = fullname -- can be cached
+        ds.fullname = foundname -- original
+        ds.format   = l.format
+        ds.status   = (l.bugged and 0) or (l.found and 10) or 0
+    end
+    return data
+end
+
+function figures.identify(data)
+    data = data or callstack[#callstack] or lastfiguredata
+    if data then
+        local list = identifiers.list -- defined at the end
+        for i=1,#list do
+            local identifier = list[i]
+            local data = identifier(data)
+--             if data and (not data.status and data.status.status > 0) then
+            if data and (not data.status and data.status.status > 0) then
+                break
+            end
+        end
+    end
+    return data
+end
+
+function figures.exists(askedname,format,resolve)
+    return (existers[format] or existers.generic)(askedname,resolve)
+end
+
+function figures.check(data)
+    data = data or callstack[#callstack] or lastfiguredata
+    return (checkers[data.status.format] or checkers.generic)(data)
+end
+
+local used_images = { }
+
+statistics.register("used graphics",function()
+    if trace_usage then
+        local filename = file.nameonly(environment.jobname) .. "-figures-usage.lua"
+        if next(figures_found) then
+            local found = { }
+            for _, data in sortedhash(figures_found) do
+                found[#found+1] = data
+                for k, v in next, data do
+                    if v == false or v == "" then
+                        data[k] = nil
+                    end
+                end
+            end
+            for i=1,#used_images do
+                local u = used_images[i]
+                local s = u.status
+                if s then
+                    s.status = nil -- doesn't say much here
+                    if s.error then
+                        u.used = { } -- better show that it's not used
+                    end
+                end
+                for _, t in next, u do
+                    for k, v in next, t do
+                        if v == false or v == "" or k == "private" then
+                            t[k] = nil
+                        end
+                    end
+                end
+            end
+            table.save(filename,{
+                found = found,
+                used  = used_images,
+            } )
+            return format("log saved in '%s'",filename)
+        else
+            os.remove(filename)
+        end
+    end
+end)
+
+function figures.include(data)
+    data = data or callstack[#callstack] or lastfiguredata
+    if trace_usage then
+        used_images[#used_images+1] = data
+    end
+    return (includers[data.status.format] or includers.generic)(data)
+end
+
+function figures.scale(data) -- will become lua code
+    data = data or callstack[#callstack] or lastfiguredata
+    ctx_doscalefigure()
+    return data
+end
+
+function figures.done(data)
+    figures.nofprocessed = figures.nofprocessed + 1
+    data = data or callstack[#callstack] or lastfiguredata
+    local dr, du, ds, nr = data.request, data.used, data.status, figures.boxnumber
+    local box = texgetbox(nr)
+    ds.width  = box.width
+    ds.height = box.height
+    -- somehow this fails on some of tacos files
+ -- ds.xscale = ds.width /(du.width  or 1)
+ -- ds.yscale = ds.height/(du.height or 1)
+    -- du.width and du.height can be false
+    if du.width and du.height and du.width > 0 and du.height > 0 then
+        ds.xscale = ds.width /du.width
+        ds.yscale = ds.height/du.height
+    elseif du.xsize and du.ysize and du.xsize > 0 and du.ysize > 0 then
+        ds.xscale = ds.width /du.xsize
+        ds.yscale = ds.height/du.ysize
+    else
+        ds.xscale = 1
+        ds.yscale = 1
+    end
+    -- sort of redundant but can be limited
+    ds.page = ds.page or du.page or dr.page
+    return data
+end
+
+function figures.dummy(data)
+    data = data or callstack[#callstack] or lastfiguredata
+    local dr, du, nr = data.request, data.used, figures.boxnumber
+    local box  = hpack(node.new("hlist")) -- we need to set the dir (luatex 0.60 buglet)
+    du.width   = du.width  or figures.defaultwidth
+    du.height  = du.height or figures.defaultheight
+    du.depth   = du.depth  or figures.defaultdepth
+    box.width  = du.width
+    box.height = du.height
+    box.depth  = du.depth
+    texsetbox(nr,box) -- hm, should be global (to be checked for consistency)
+end
+
+-- -- -- generic -- -- --
+
+function existers.generic(askedname,resolve)
+    -- not findbinfile
+    local result
+    if hasscheme(askedname) then
+        result = resolvers.findbinfile(askedname)
+    elseif isfile(askedname) then
+        result = askedname
+    elseif resolve then
+        result = resolvers.findbinfile(askedname)
+    end
+    if not result or result == "" then
+        result = false
+    end
+    if trace_figures then
+        if result then
+            report_inclusion("%a resolved to %a",askedname,result)
+        else
+            report_inclusion("%a cannot be resolved",askedname)
+        end
+    end
+    return result
+end
+
+-- pdf : 0-3: 0 90 180 270
+-- jpeg: 0 unset 1-4: 0 90 180 270 5-8: flipped r/c
+
+local transforms = setmetatableindex (
+    {
+        ["orientation-1"] = 0, ["R0"]     = 0,
+        ["orientation-2"] = 4, ["R0MH"]   = 4,
+        ["orientation-3"] = 2, ["R180"]   = 2,
+        ["orientation-4"] = 6, ["R0MV"]   = 6,
+        ["orientation-5"] = 5, ["R270MH"] = 5,
+        ["orientation-6"] = 3, ["R90"]    = 3,
+        ["orientation-7"] = 7, ["R90MH"]  = 7,
+        ["orientation-8"] = 1, ["R270"]   = 1,
+    },
+    function(t,k) -- transforms are 0 .. 7
+        local v = tonumber(k) or 0
+        if v < 0 or v > 7 then
+            v = 0
+        end
+        t[k] = v
+        return v
+    end
+)
+
+local function checktransform(figure,forced)
+    if auto_transform then
+
+        local orientation = (forced ~= "" and forced ~= v_auto and forced) or figure.orientation or 0
+        local transform   = transforms["orientation-"..orientation]
+        figure.transform = transform
+        if odd(transform) then
+            return figure.height, figure.width
+        else
+            return figure.width, figure.height
+        end
+    end
+end
+
+local pagecount = { }
+
+function checkers.generic(data)
+    local dr, du, ds    = data.request, data.used, data.status
+    local name          = du.fullname or "unknown generic"
+    local page          = du.page or dr.page
+    local size          = dr.size or "crop"
+    local color         = dr.color or "natural"
+    local mask          = dr.mask or "none"
+    local conversion    = dr.conversion
+    local resolution    = dr.resolution
+    local arguments     = dr.arguments
+    local scanimage     = dr.scanimage or scanimage
+    local userpassword  = dr.userpassword
+    local ownerpassword = dr.ownerpassword
+    if not conversion or conversion == "" then
+        conversion = "default"
+    end
+    if not resolution or resolution == "" then
+        resolution = "default"
+    end
+    if not arguments or arguments == "" then
+        arguments = "default"
+    end
+    local hash = f_hash_full(
+        name,
+        page,
+        size,
+        color,
+        mask,
+        conversion,
+        resolution,
+        arguments
+    )
+    --
+    local figure = figures_loaded[hash]
+    if figure == nil then
+        figure = createimage {
+            filename        = name,
+            page            = page,
+            pagebox         = dr.size,
+            keepopen        = dr.keepopen or false,
+            userpassword    = userpassword,
+            ownerpassword   = ownerpassword,
+         -- visiblefilename = "", -- this prohibits the full filename ending up in the file
+        }
+        codeinjections.setfigurecolorspace(data,figure)
+        codeinjections.setfiguremask(data,figure)
+        if figure then
+            -- new, bonus check (a bogus check in lmtx)
+            if page and page > 1 then
+                local f = scanimage {
+                    filename      = name,
+                    userpassword  = userpassword,
+                    ownerpassword = ownerpassword,
+                }
+                if f and f.page and f.pages < page then
+                    report_inclusion("no page %i in %a, using page 1",page,name)
+                    page        = 1
+                    figure.page = page
+                end
+            end
+            -- till here
+            local f, comment = checkimage(scanimage(figure))
+            if not f then
+                ds.comment = comment
+                ds.found   = false
+                ds.error   = true
+            end
+            if figure.attr and not f.attr then
+                -- tricky as img doesn't allow it
+                f.attr = figure.attr
+            end
+            if dr.cmyk == v_yes then
+                f.enforcecmyk = true
+            elseif dr.cmyk == v_auto and attributes.colors.model == "cmyk" then
+                f.enforcecmyk = true
+            end
+            figure = f
+        end
+        local f, d = codeinjections.setfigurealternative(data,figure)
+        figure = f or figure
+        data   = d or data
+        figures_loaded[hash] = figure
+        if trace_conversion then
+            report_inclusion("new graphic, using hash %a",hash)
+        end
+    else
+        if trace_conversion then
+            report_inclusion("existing graphic, using hash %a",hash)
+        end
+    end
+    if figure then
+        local width, height = checktransform(figure,dr.transform)
+        --
+        du.width       = width
+        du.height      = height
+        du.pages       = figure.pages
+        du.depth       = figure.depth or 0
+        du.colordepth  = figure.colordepth or 0
+        du.xresolution = figure.xres or 0
+        du.yresolution = figure.yres or 0
+        du.xsize       = figure.xsize or 0
+        du.ysize       = figure.ysize or 0
+        du.rotation    = figure.rotation or 0    -- in pdf multiples or 90% in jpeg 1
+        du.orientation = figure.orientation or 0 -- jpeg 1 2 3 4 (0=unset)
+        ds.private     = figure
+        ds.hash        = hash
+    end
+    return data
+end
+
+local nofimages = 0
+local pofimages = { }
+
+function figures.getrealpage(index)
+    return pofimages[index] or 0
+end
+
+local function updatepage(specification)
+    local n = specification.n
+    pofimages[n] = pofimages[n] or tex.count.realpageno -- so when reused we register the first one only
+end
+
+function includers.generic(data)
+    local dr, du, ds = data.request, data.used, data.status
+    -- here we set the 'natural dimensions'
+    dr.width     = du.width
+    dr.height    = du.height
+    local hash   = figures.hash(data)
+    local figure = figures_used[hash]
+ -- figures.registerresource {
+ --     filename = du.fullname,
+ --     width    = dr.width,
+ --     height   = dr.height,
+ -- }
+    if figure == nil then
+        figure = ds.private -- the img object
+        if figure then
+            figure = (dr.copyimage or copyimage)(figure)
+            if figure then
+                figure.width  = dr.width  or figure.width
+                figure.height = dr.height or figure.height
+            end
+        end
+        figures_used[hash] = figure
+    end
+    if figure then
+        local nr     = figures.boxnumber
+        nofimages    = nofimages + 1
+        ds.pageindex = nofimages
+        local image  = wrapimage(figure)
+        local pager  = new_latelua { action = updatepage, n = nofimages }
+        image.next   = pager
+        pager.prev   = image
+        local box    = hpack(image)
+        box.width    = figure.width
+        box.height   = figure.height
+        box.depth    = 0
+        texsetbox(nr,box)
+        ds.objectnumber = figure.objnum
+     -- indexed[figure.index] = figure
+        ctx_relocateexternalfigure()
+    end
+    return data
+end
+
+-- -- -- nongeneric -- -- --
+
+local function checkers_nongeneric(data,command) -- todo: macros and context.*
+    local dr, du, ds = data.request, data.used, data.status
+    local name = du.fullname or "unknown nongeneric"
+    local hash = name
+    if dr.object then
+        -- hm, bugged ... waiting for an xform interface
+        if not objects.data["FIG"][hash] then
+            if type(command) == "function" then
+                command()
+            end
+            ctx_dosetfigureobject("FIG",hash)
+        end
+        ctx_doboxfigureobject("FIG",hash)
+    elseif type(command) == "function" then
+        command()
+    end
+    return data
+end
+
+local function includers_nongeneric(data)
+    return data
+end
+
+checkers.nongeneric  = checkers_nongeneric
+includers.nongeneric = includers_nongeneric
+
+-- -- -- mov -- -- --
+
+function checkers.mov(data)
+    local dr, du, ds = data.request, data.used, data.status
+    local width = todimen(dr.width or figures.defaultwidth)
+    local height = todimen(dr.height or figures.defaultheight)
+    local foundname = du.fullname
+    dr.width, dr.height = width, height
+    du.width, du.height, du.foundname = width, height, foundname
+    if trace_inclusion then
+        report_inclusion("including movie %a, width %p, height %p",foundname,width,height)
+    end
+    -- we need to push the node.write in between ... we could make a shared helper for this
+    ctx_startfoundexternalfigure(width .. "sp",height .. "sp")
+    context(function()
+        nodeinjections.insertmovie {
+            width      = width,
+            height     = height,
+            factor     = bpfactor,
+            ["repeat"] = dr["repeat"],
+            controls   = dr.controls,
+            preview    = dr.preview,
+            label      = dr.label,
+            foundname  = foundname,
+        }
+    end)
+    ctx_stopfoundexternalfigure()
+    return data
+end
+
+includers.mov = includers.nongeneric
+
+-- -- -- mps -- -- --
+
+internalschemes.mprun = true
+
+-- mprun.foo.1 mprun.6 mprun:foo.2
+
+local ctx_docheckfiguremprun = context.docheckfiguremprun
+local ctx_docheckfiguremps   = context.docheckfiguremps
+
+local function internal(askedname)
+    local spec, mprun, mpnum = match(lower(askedname),"mprun([:%.]?)(.-)%.(%d+)")
+ -- mpnum = tonumber(mpnum) or 0 -- can be string or number, fed to context anyway
+    if spec ~= "" then
+        return mprun, mpnum
+    else
+        return "", mpnum
+    end
+end
+
+function existers.mps(askedname)
+    local mprun, mpnum = internal(askedname)
+    if mpnum then
+        return askedname, true, "mps", true
+    else
+        return existers.generic(askedname)
+    end
+end
+
+function checkers.mps(data)
+    local mprun, mpnum = internal(data.used.fullname)
+    if mpnum then
+        return checkers_nongeneric(data,function() ctx_docheckfiguremprun(mprun,mpnum) end)
+    else
+        return checkers_nongeneric(data,function() ctx_docheckfiguremps(data.used.fullname) end)
+    end
+end
+
+includers.mps = includers.nongeneric
+
+-- -- -- tex -- -- --
+
+local ctx_docheckfiguretex = context.docheckfiguretex
+
+function existers.tex(askedname)
+    askedname = resolvers.findfile(askedname)
+    return askedname ~= "" and askedname or false, true, "tex", true
+end
+
+function checkers.tex(data)
+    return checkers_nongeneric(data,function() ctx_docheckfiguretex(data.used.fullname) end)
+end
+
+includers.tex = includers.nongeneric
+
+-- -- -- buffer -- -- --
+
+local ctx_docheckfigurebuffer = context.docheckfigurebuffer
+
+function existers.buffer(askedname)
+    local name = file.nameonly(askedname)
+    local okay = buffers.exists(name)
+    return okay and name, true, "buffer", true -- always quit scanning
+end
+
+function checkers.buffer(data)
+    return checkers_nongeneric(data,function() ctx_docheckfigurebuffer(file.nameonly(data.used.fullname)) end)
+end
+
+includers.buffers = includers.nongeneric
+
+-- -- -- auto -- -- --
+
+function existers.auto(askedname)
+    local name = gsub(askedname, ".auto$", "")
+    local format = figures.guess(name)
+ -- if format then
+ --     report_inclusion("format guess %a for %a",format,name)
+ -- else
+ --     report_inclusion("format guess for %a is not possible",name)
+ -- end
+    return format and name, true, format
+end
+
+checkers.auto  = checkers.generic
+includers.auto = includers.generic
+
+-- -- -- cld -- -- --
+
+local ctx_docheckfigurecld = context.docheckfigurecld
+
+function existers.cld(askedname)
+    askedname = resolvers.findfile(askedname)
+    return askedname ~= "" and askedname or false, true, "cld", true
+end
+
+function checkers.cld(data)
+    return checkers_nongeneric(data,function() ctx_docheckfigurecld(data.used.fullname) end)
+end
+
+includers.cld = includers.nongeneric
+
+-- -- -- converters -- -- --
+
+setmetatableindex(converters,"table")
+
+-- We keep this helper because it has been around for a while and therefore it can
+-- be a depedency in an existing workflow.
+
+function programs.makeoptions(options)
+    local to = type(options)
+    return (to == "table" and concat(options," ")) or (to == "string" and options) or ""
+end
+
+function programs.run(binary,argument,variables)
+    local found = nil
+    if type(binary) == "table" then
+        for i=1,#binary do
+            local b = binary[i]
+            found = os.which(b)
+            if found then
+                binary = b
+                break
+            end
+        end
+        if not found then
+            binary = concat(binary, " | ")
+        end
+    elseif binary then
+        found = os.which(match(binary,"[%S]+"))
+    end
+    if type(argument) == "table" then
+        argument = concat(argument," ") -- for old times sake
+    end
+    if not found then
+        report_inclusion("program %a is not installed",binary or "?")
+    elseif not argument or argument == "" then
+        report_inclusion("nothing to run, no arguments for program %a",binary)
+    else
+        -- no need to use the full found filename (found) .. we also don't quote the program
+        -- name any longer as in luatex there is too much messing with these names
+        local command = format([[%s %s]],binary,replacetemplate(longtostring(argument),variables))
+        if trace_conversion or trace_programs then
+            report_inclusion("running command: %s",command)
+        end
+        os.execute(command)
+    end
+end
+
+-- the rest of the code has been moved to grph-con.lua
+
+-- -- -- bases -- -- --
+
+local bases         = allocate()
+figures.bases       = bases
+
+local bases_list    = nil -- index      => { basename, fullname, xmlroot }
+local bases_used    = nil -- [basename] => { basename, fullname, xmlroot } -- pointer to list
+local bases_found   = nil
+local bases_enabled = false
+
+local function reset()
+    bases_list    = allocate()
+    bases_used    = allocate()
+    bases_found   = allocate()
+    bases_enabled = false
+    bases.list    = bases_list
+    bases.used    = bases_used
+    bases.found   = bases_found
+end
+
+reset()
+
+function bases.use(basename)
+    if basename == "reset" then
+        reset()
+    else
+        basename = file.addsuffix(basename,"xml")
+        if not bases_used[basename] then
+            local t = { basename, nil, nil }
+            bases_used[basename] = t
+            bases_list[#bases_list+1] = t
+            if not bases_enabled then
+                bases_enabled = true
+                xml.registerns("rlx","http://www.pragma-ade.com/schemas/rlx") -- we should be able to do this per xml file
+            end
+            if trace_bases then
+                report_inclusion("registering base %a",basename)
+            end
+        end
+    end
+end
+
+implement { name = "usefigurebase", actions = bases.use, arguments = "string" }
+
+local function bases_find(basename,askedlabel)
+    if trace_bases then
+        report_inclusion("checking for %a in base %a",askedlabel,basename)
+    end
+    basename = file.addsuffix(basename,"xml")
+    local t = bases_found[askedlabel]
+    if t == nil then
+        local base = bases_used[basename]
+        local page = 0
+        if base[2] == nil then
+            -- no yet located
+            for i=1,#figure_paths do
+                local path = resolveprefix(figure_paths[i]) -- we resolve (e.g. jobfile:)
+                local xmlfile = path .. "/" .. basename
+                if io.exists(xmlfile) then
+                    base[2] = xmlfile
+                    base[3] = xml.load(xmlfile)
+                    if trace_bases then
+                        report_inclusion("base %a loaded",xmlfile)
+                    end
+                    break
+                end
+            end
+        end
+        t = false
+        if base[2] and base[3] then -- rlx:library
+            for e in xml.collected(base[3],"/(*:library|figurelibrary)/*:figure/*:label") do
+                page = page + 1
+                if xml.text(e) == askedlabel then
+                    t = {
+                        base   = file.replacesuffix(base[2],"pdf"),
+                        format = "pdf",
+                        name   = xml.text(e,"../*:file"), -- to be checked
+                        page   = page,
+                    }
+                    bases_found[askedlabel] = t
+                    if trace_bases then
+                        report_inclusion("figure %a found in base %a",askedlabel,base[2])
+                    end
+                    return t
+                end
+            end
+            if trace_bases and not t then
+                report_inclusion("figure %a not found in base %a",askedlabel,base[2])
+            end
+        end
+    end
+    return t
+end
+
+-- we can access sequential or by name
+
+local function bases_locate(askedlabel)
+    for i=1,#bases_list do
+        local entry = bases_list[i]
+        local t = bases_find(entry[1],askedlabel,1,true)
+        if t then
+            return t
+        end
+    end
+    return false
+end
+
+function identifiers.base(data)
+    if bases_enabled then
+        local dr, du, ds = data.request, data.used, data.status
+        local fbl = bases_locate(dr.name or dr.label)
+        if fbl then
+            du.page     = fbl.page
+            du.format   = fbl.format
+            du.fullname = fbl.base
+            ds.fullname = fbl.name
+            ds.format   = fbl.format
+            ds.page     = fbl.page
+            ds.status   = 10
+        end
+    end
+    return data
+end
+
+bases.locate = bases_locate
+bases.find   = bases_find
+
+identifiers.list = {
+    identifiers.base,
+    identifiers.default
+}
+
+-- tracing
+
+statistics.register("graphics processing time", function()
+    local nofprocessed = figures.nofprocessed
+    if nofprocessed > 0 then
+        local nofnames, nofbadnames = 0, 0
+        for hash, data in next, figures_found do
+            nofnames = nofnames + 1
+            if data.badname then
+                nofbadnames = nofbadnames + 1
+            end
+        end
+        return format("%s seconds including tex, %s processed images, %s unique asked, %s bad names",
+            statistics.elapsedtime(figures),nofprocessed,nofnames,nofbadnames)
+    else
+        return nil
+    end
+end)
+
+-- helper
+
+function figures.applyratio(width,height,w,h) -- width and height are strings and w and h are numbers
+    if not width or width == "" then
+        if not height or height == "" then
+            return figures.defaultwidth, figures.defaultheight
+        else
+            height = todimen(height)
+            if w and h then
+                return height * w/h, height
+            else
+                return figures.defaultwidth, height
+            end
+        end
+    else
+        width = todimen(width)
+        if not height or height == "" then
+            if w and h then
+                return width, width * h/w
+            else
+                return width, figures.defaultheight
+            end
+        else
+            return width, todimen(height)
+        end
+    end
+end
+
+-- example of simple plugins:
+--
+-- figures.converters.png = {
+--     png = function(oldname,newname,resolution)
+--         local command = string.format('gm convert -depth 1 "%s" "%s"',oldname,newname)
+--         logs.report(string.format("running command %s",command))
+--         os.execute(command)
+--     end,
+-- }
+
+-- local n = "foo.pdf"
+-- local d = figures.getinfo(n)
+-- if d then
+--     for i=1,d.used.pages do
+--         local p = figures.getinfo(n,i)
+--         if p then
+--             local u = p.used
+--             print(u.width,u.height,u.orientation)
+--         end
+--     end
+-- end
+
+function figures.getinfo(name,page)
+    if type(name) == "string" then
+        name = { name = name, page = page }
+    end
+    if name.name then
+        local data = figures.push(name)
+        data = figures.identify(data)
+        if data.status and data.status.status > 0 then
+            data = figures.check(data)
+        end
+        figures.pop()
+        return data
+    end
+end
+
+function figures.getpdfinfo(name,page,metadata)
+    -- not that useful but as we have it for detailed inclusion we can as
+    -- we expose it
+    if type(name) ~= "table" then
+        name = { name = name, page = page, metadata = metadata }
+    end
+    return codeinjections.getinfo(name)
+end
+
+-- interfacing
+
+implement {
+    name      = "figure_push",
+    scope     = "private",
+    actions   = figures.push,
+    arguments = {
+        {
+            { "name" },
+            { "label" },
+            { "page" },
+            { "file" },
+            { "size" },
+            { "object" },
+            { "prefix" },
+            { "cache" },
+            { "format" },
+            { "preset" },
+            { "controls" },
+            { "resources" },
+            { "preview" },
+            { "display" },
+            { "mask" },
+            { "conversion" },
+            { "resolution" },
+            { "color" },
+            { "cmyk" },
+            { "arguments" },
+            { "repeat" },
+            { "transform" },
+            { "compact" },
+            { "width", "dimen" },
+            { "height", "dimen" },
+            { "userpassword" },
+            { "ownerpassword" },
+        }
+    }
+}
+
+-- beware, we get a number passed by default
+
+implement { name = "figure_pop",      scope = "private", actions = figures.pop }
+implement { name = "figure_done",     scope = "private", actions = figures.done }
+implement { name = "figure_dummy",    scope = "private", actions = figures.dummy }
+implement { name = "figure_identify", scope = "private", actions = figures.identify }
+implement { name = "figure_scale",    scope = "private", actions = figures.scale }
+implement { name = "figure_check",    scope = "private", actions = figures.check }
+implement { name = "figure_include",  scope = "private", actions = figures.include }
+
+implement {
+    name      = "setfigurelookuporder",
+    actions   = figures.setorder,
+    arguments = "string"
+}
+
+implement {
+    name      = "figure_reset",
+    scope     = "private",
+    arguments = { "integer", "dimen", "dimen" },
+    actions   = function(box,width,height)
+        figures.boxnumber     = box
+        figures.defaultwidth  = width
+        figures.defaultheight = height
+    end
+}
+
+-- require("util-lib-imp-gm")
+--
+-- figures.converters.tif.pdf = function(oldname,newname,resolution)
+--     logs.report("graphics","using gm library to convert %a",oldname)
+--     utilities.graphicmagick.convert {
+--         inputname  = oldname,
+--         outputname = newname,
+--     }
+-- end
+--
+-- \externalfigure[t:/sources/hakker1b.tiff]
+
+-- something relatively new:
+
+local registered = { }
+
+local ctx_doexternalfigurerepeat = context.doexternalfigurerepeat
+
+implement {
+    name      = "figure_register_page",
+    arguments = "3 strings",
+    actions   = function(a,b,c)
+        registered[#registered+1] = { a, b, c }
+        context(#registered)
+    end
+}
+
+implement {
+    name    = "figure_nof_registered_pages",
+    actions = function()
+        context(#registered)
+    end
+}
+
+implement {
+    name      = "figure_flush_registered_pages",
+    arguments = "string",
+    actions   = function(n)
+        local f = registered[tonumber(n)]
+        if f then
+            ctx_doexternalfigurerepeat(f[1],f[2],f[3],n)
+        end
+    end
+}
diff --git a/tex/context/base/mkxl/grph-inc.mkxl b/tex/context/base/mkxl/grph-inc.mkxl
index 4a6626617..99ceea4d3 100644
--- a/tex/context/base/mkxl/grph-inc.mkxl
+++ b/tex/context/base/mkxl/grph-inc.mkxl
@@ -21,12 +21,12 @@
 \writestatus{loading}{ConTeXt Graphic Macros / Figure Inclusion}
 
 \registerctxluafile{grph-img}{}
-\registerctxluafile{grph-inc}{}
+\registerctxluafile{grph-inc}{autosuffix}
 \registerctxluafile{grph-bmp}{}
 \registerctxluafile{grph-chk}{}
 \registerctxluafile{grph-con}{}
 \registerctxluafile{grph-fil}{}
-\registerctxluafile{grph-mem}{}
+%registerctxluafile{grph-mem}{} % obsolete
 \registerctxluafile{grph-u3d}{} % this will become a module
 %registerctxluafile{grph-swf}{} % this will become a module
 
diff --git a/tex/context/base/mkxl/grph-trf.lmt b/tex/context/base/mkxl/grph-trf.lmt
new file mode 100644
index 000000000..f68d6a6a8
--- /dev/null
+++ b/tex/context/base/mkxl/grph-trf.lmt
@@ -0,0 +1,126 @@
+if not modules then modules = { } end modules ['grph-trf'] = {
+    version   = 1.001,
+    comment   = "companion to grph-trf.mkiv",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files"
+}
+
+-- see grph-trf-todo.lua for older preliminary code for the rest
+
+local sind, cosd, tand, abs = math.sind, math.cosd, math.tand, math.abs
+
+local setdimension = tex.setdimensionvalue
+
+local function analyzerotate(rotation,width,height,depth,total,notfit,obeydepth)
+    --
+ -- print(rotation,width,height,depth,notfit,obeydepth)
+    --
+    local sin       = sind(rotation)
+    local cos       = cosd(rotation)
+    local abssin    = abs(sin)
+    local abscos    = abs(cos)
+    local xsize     = 0
+    local ysize     = 0
+    local xposition = 0
+    local yposition = 0
+    local xoffset   = 0
+    local yoffset   = 0
+    local newwidth  = width
+    local newheight = height
+    local newdepth  = depth
+ -- print(sin,cos)
+    if sin > 0 then
+        if cos > 0 then
+            xsize     = cos * width + sin * total
+            ysize     = sin * width + cos * total
+            yposition =               cos * total
+            if notfit then
+                xoffset  = - sin * height
+                newwidth = sin * depth + cos * width
+            else
+                newwidth = xsize + xposition - xoffset
+            end
+            if obeydepth then
+                yoffset = cos * depth
+            end
+            newheight = ysize - yoffset
+            newdepth  = yoffset
+         -- print("case 1, done")
+        else
+            xsize     = abscos * width +    sin * total
+            ysize     =    sin * width + abscos * total
+            xposition = abscos * width
+            if notfit then
+                xoffset = - xsize + sin * depth
+            end
+            if obeydepth then
+                yoffset  = abscos * height
+                newwidth = abssin * total + abscos * width + xoffset
+            else
+                newwidth = xsize
+            end
+            newheight = ysize - yoffset
+            newdepth  = yoffset
+         -- print("case 2, done")
+        end
+    else
+        if cos < 0 then
+            xsize     = abscos * width + abssin * total
+            ysize     = abssin * width + abscos * total
+            xposition = xsize
+            yposition = abssin * width
+            if notfit then
+                xoffset = - xsize + abssin * height
+            end
+            if obeydepth then
+                yoffset = ysize + cos * depth
+            end
+            newwidth  = notfit and (abssin * height) or xsize
+            newheight = ysize - yoffset
+            newdepth  = yoffset
+         -- print("case 3, done")
+        else
+            xsize     =    cos * width + abssin * total
+            ysize     = abssin * width +    cos * total
+            xposition =                  abssin * total
+            yposition =                     cos * total
+            if notfit then
+                xoffset = - abssin * depth
+                newwidth = xsize + xoffset
+            else
+                newwidth = xsize
+            end
+            if obeydepth then
+                yoffset = cos * depth
+            end
+            newheight = ysize - yoffset + sin * width
+            newdepth  =         yoffset - sin * width
+         -- print("case 4, done")
+        end
+    end
+    setdimension("d_grph_rotate_x_size",     xsize)
+    setdimension("d_grph_rotate_y_size",     ysize)
+    setdimension("d_grph_rotate_x_position", xposition)
+    setdimension("d_grph_rotate_y_position", yposition)
+    setdimension("d_grph_rotate_x_offset",   xoffset)
+    setdimension("d_grph_rotate_y_offset",   yoffset)
+    setdimension("d_grph_rotate_new_width",  newwidth)
+    setdimension("d_grph_rotate_new_height", newheight)
+    setdimension("d_grph_rotate_new_depth",  newdepth)
+end
+
+interfaces.implement {
+    name      = "analyzerotate",
+    actions   = analyzerotate,
+    arguments = {
+--         "integer",
+        "number",
+        "dimension",
+        "dimension",
+        "dimension",
+        "dimension",
+        "conditional",
+        "conditional",
+    },
+}
diff --git a/tex/context/base/mkxl/grph-trf.mkxl b/tex/context/base/mkxl/grph-trf.mkxl
index 87e4da7f4..550eb6f96 100644
--- a/tex/context/base/mkxl/grph-trf.mkxl
+++ b/tex/context/base/mkxl/grph-trf.mkxl
@@ -24,7 +24,7 @@
 %D We could move the calculations to \LUA\ and clean up this lot anyway. On the
 %D other hand, there is some danger of messing up so it has a real low priority.
 
-\registerctxluafile{grph-trf}{}
+\registerctxluafile{grph-trf}{autosuffix}
 
 % local:
 
@@ -266,18 +266,18 @@
    \glet\finalscaleboxyscale \m_grph_scale_used_y_scale
    \grph_scale_calculations_report}
 
-\setvalue{\??scalegrid\v!yes     }{\getnoflines   \d_grph_scale_used_y_size\edef\p_height{\the\noflines\lineheight}}
-\setvalue{\??scalegrid\v!height  }{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight+\strutdepth}}
-\setvalue{\??scalegrid\v!depth   }{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight-\strutdepth}}
-\setvalue{\??scalegrid\v!halfline}{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight+.5\lineheight}}
-\setvalue{\??scalegrid\v!fit     }{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\noflines\lineheight}}
-\letvalue{\??scalegrid\empty     }\donothing
+\defcsname\??scalegrid\v!yes     \endcsname{\getnoflines   \d_grph_scale_used_y_size\edef\p_height{\the\noflines\lineheight}}
+\defcsname\??scalegrid\v!height  \endcsname{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight+\strutdepth}}
+\defcsname\??scalegrid\v!depth   \endcsname{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight-\strutdepth}}
+\defcsname\??scalegrid\v!halfline\endcsname{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\dimexpr\noflines\lineheight+.5\lineheight}}
+\defcsname\??scalegrid\v!fit     \endcsname{\getrawnoflines\d_grph_scale_used_y_size\edef\p_height{\the\noflines\lineheight}}
+\letcsname\??scalegrid\empty     \endcsname\donothing
 
 \def\grph_scale_check_parameters % resolve self referencing loops
   {\ifempty\p_maxwidth \else \edef\p_maxwidth {\the\dimexpr\p_maxwidth        }\fi
    \ifempty\p_maxheight\else \edef\p_maxheight{\the\dimexpr\p_maxheight       }\fi
    \ifempty\p_lines    \else \edef\p_height   {\the\dimexpr\p_lines\lineheight}\fi
-   \csname\??scalegrid\scaleparameter\c!grid\endcsname}
+   \begincsname\??scalegrid\scaleparameter\c!grid\endcsname}
 
 \def\grph_scale_by_nature % where ! ! ! ! !
   {\ifempty\p_width \else \global\d_grph_scale_used_x_size\p_width \fi
@@ -373,16 +373,11 @@
      \global\d_grph_scale_used_y_size\zeropoint
      %
      \ifempty\p_maxwidth
-       \ifempty\p_maxheight
-       \else
-         \ifdim\d_grph_scale_y_size>\p_maxheight\relax
-           \global\d_grph_scale_used_y_size\p_maxheight
-         \fi
-       \fi
-     \else
-       \ifdim\d_grph_scale_x_size>\p_maxwidth\relax
-          \global\d_grph_scale_used_x_size\p_maxwidth
+       \ifempty\p_maxheight\orelse\ifdim\d_grph_scale_y_size>\p_maxheight\relax
+         \global\d_grph_scale_used_y_size\p_maxheight
        \fi
+     \orelse\ifdim\d_grph_scale_x_size>\p_maxwidth\relax
+       \global\d_grph_scale_used_x_size\p_maxwidth
      \fi
    \fi}
 
@@ -441,45 +436,35 @@
 
 \def\grph_scale_by_dimension_indeed#1#2#3%
   {#1\relax
-   \ifempty\p_maxwidth \else
-     \ifdim\d_grph_scale_used_x_size>\p_maxwidth\relax
-       \global\d_grph_scale_used_x_size\p_maxwidth
-       #2\relax
-     \fi
+   \ifempty\p_maxwidth\orelse\ifdim\d_grph_scale_used_x_size>\p_maxwidth\relax
+     \global\d_grph_scale_used_x_size\p_maxwidth
+     #2\relax
    \fi
-   \ifempty\p_maxheight \else
-     \ifdim\d_grph_scale_used_y_size>\p_maxheight\relax
-       \global\d_grph_scale_used_y_size\p_maxheight
-        #3\relax
-     \fi
+   \ifempty\p_maxheight\orelse\ifdim\d_grph_scale_used_y_size>\p_maxheight\relax
+     \global\d_grph_scale_used_y_size\p_maxheight
+      #3\relax
    \fi}
 
+% we can use \lastnamedcs if we want to squeeze out some more
+
 \def\grph_scale_calculate_norm#1#2% todo: swap 1 and 2 and pass one less
   {\csname\??scalenorm\ifcsname\??scalenorm#2\endcsname#2\else\s!unknown\fi\endcsname#1#2}
 
 \def\grph_scale_calculate_fact#1%
   {\csname\??scalefact\ifcsname\??scalefact#1\endcsname#1\else\s!unknown\fi\endcsname}
 
-%setvalue{\??scalenorm\v!min    }#1#2#3#4#5{\global#1#4}
-\setvalue{\??scalenorm\v!max    }#1#2#3#4#5{\global#1#4}
-\setvalue{\??scalenorm\v!fit    }#1#2#3#4#5{\global#1#5}
-\setvalue{\??scalenorm\v!broad  }#1#2#3#4#5{\global#1\dimexpr#5-4\externalfigureparameter\c!bodyfont\relax}
-\setvalue{\??scalenorm\s!unknown}#1#2#3#4#5{\global#1\dimexpr#2\dimexpr\externalfigureparameter\c!bodyfont/10\relax\relax} % brr ex
-\setvalue{\??scalenorm\v!auto   }#1#2#3#4#5{\ifempty#3\else\global#1#3\fi}
-\setvalue{\??scalenorm\empty    }#1#2#3#4#5{\ifempty#3\else\global#1#3\fi}
-\setvalue{\??scalenorm\s!default}#1#2#3#4#5{\ifempty#3\else\global#1#3\fi}
-
-\setvalue{\??scalefact\v!min    }{\global\settrue \c_grph_scale_swap_factor}
-\setvalue{\??scalefact\s!unknown}{\global\setfalse\c_grph_scale_swap_factor}
-
-% \setvalue{\??scalenorm\v!min    }#1#2#3#4#5% an ugly hack
-%   {\ifdim\d_grph_scale_used_x_size>\d_grph_scale_h_size
-%      \d_grph_scale_used_y_size\vsize
-%    \else
-%      \d_grph_scale_used_x_size\hsize
-%    \fi}
-
-\setvalue{\??scalenorm\v!min}#1#2#3#4#5% an ugly hack
+\defcsname\??scalenorm\v!max    \endcsname#1#-#-#2#-{\global#1#2}
+\defcsname\??scalenorm\v!fit    \endcsname#1#-#-#-#2{\global#1#2}
+\defcsname\??scalenorm\v!broad  \endcsname#1#-#-#-#2{\global#1\dimexpr#2-4\externalfigureparameter\c!bodyfont\relax}
+\defcsname\??scalenorm\s!unknown\endcsname#1#2#-#-#-{\global#1\dimexpr#2\dimexpr\externalfigureparameter\c!bodyfont/10\relax\relax} % brr ex
+\defcsname\??scalenorm\v!auto   \endcsname#1#-#2#-#-{\ifempty#2\else\global#1#2\fi}
+\defcsname\??scalenorm\empty    \endcsname#1#-#2#-#-{\ifempty#2\else\global#1#2\fi}
+\defcsname\??scalenorm\s!default\endcsname#1#-#2#-#-{\ifempty#2\else\global#1#2\fi}
+
+\defcsname\??scalefact\v!min    \endcsname{\global\settrue \c_grph_scale_swap_factor}
+\defcsname\??scalefact\s!unknown\endcsname{\global\setfalse\c_grph_scale_swap_factor}
+
+\defcsname\??scalenorm\v!min\endcsname#-#-#-#-#-% an ugly hack
   {\d_grph_scale_used_x_size\hsize
    \d_grph_scale_used_y_size\vsize}
 
@@ -769,14 +754,22 @@
 \installcorenamespace {rotatelocation}
 \installcorenamespace {rotatepreset}
 
-% todo: scratchcounters
+%D These are set at the \LUA\ end (it's a cheaper operation than setting a dimen
+%D register and these are actually kind of constants not used in further
+%D calculations):
 
-\newdimen\d_grph_rotate_x_size
-\newdimen\d_grph_rotate_y_size
-\newdimen\d_grph_rotate_x_offset
-\newdimen\d_grph_rotate_y_offset
-\newdimen\d_grph_rotate_x_position
-\newdimen\d_grph_rotate_y_position
+\mutable\dimendef\d_grph_rotate_x_size    \zeropoint
+\mutable\dimendef\d_grph_rotate_y_size    \zeropoint
+\mutable\dimendef\d_grph_rotate_x_offset  \zeropoint
+\mutable\dimendef\d_grph_rotate_y_offset  \zeropoint
+\mutable\dimendef\d_grph_rotate_x_position\zeropoint
+\mutable\dimendef\d_grph_rotate_y_position\zeropoint
+
+\mutable\dimendef\d_grph_rotate_new_width \zeropoint
+\mutable\dimendef\d_grph_rotate_new_height\zeropoint
+\mutable\dimendef\d_grph_rotate_new_depth \zeropoint
+
+%D These aren't:
 
 \newdimen\d_grph_rotate_used_height
 
@@ -788,10 +781,6 @@
 \newdimen\d_grph_rotate_saved_height
 \newdimen\d_grph_rotate_saved_depth
 
-\newdimen\d_grph_rotate_new_width
-\newdimen\d_grph_rotate_new_height
-\newdimen\d_grph_rotate_new_depth
-
 \newconditional\c_grph_rotate_obey_depth
 \newconditional\c_grph_rotate_not_fit
 \newconditional\c_grph_rotate_center
@@ -816,9 +805,11 @@
    \fi
    \edef\p_rotation_location{\rotateparameter\c!location}%
    \edef\p_rotation_rotation{\rotateparameter\c!rotation}%
-   \csname\??rotatelocation
-     \ifcsname\??rotatelocation\p_rotation_location\endcsname\p_rotation_location\else\v!default\fi
-   \endcsname}
+   \ifcsname\??rotatelocation\p_rotation_location\endcsname
+      \expandafter\lastnamedcs
+   \else
+      \expandafter\grph_rotate_default
+   \fi}
 
 \def\grph_rotate_framed
   {\resetrotateparameter\c!location
@@ -832,42 +823,44 @@
   {\grph_rotate_finish_indeed
    \egroup}
 
-\setvalue{\??rotatelocation\v!depth}%
+\def\grph_rotate_default
+  {\setfalse\c_grph_rotate_not_fit
+   \setfalse\c_grph_rotate_center
+   \settrue \c_grph_rotate_obey_depth
+   \grph_rotate_framed}
+
+\letcsname\??rotatelocation\v!default\endcsname\grph_rotate_default
+
+\defcsname\??rotatelocation\v!depth\endcsname
   {\setfalse\c_grph_rotate_not_fit
    \setfalse\c_grph_rotate_center
    \settrue \c_grph_rotate_obey_depth
    \grph_rotate_normal}
 
-\setvalue{\??rotatelocation\v!fit}%
+\defcsname\??rotatelocation\v!fit\endcsname
   {\settrue \c_grph_rotate_not_fit
    \setfalse\c_grph_rotate_center
    \settrue \c_grph_rotate_obey_depth
    \grph_rotate_normal}
 
-\setvalue{\??rotatelocation\v!broad}%
+\defcsname\??rotatelocation\v!broad\endcsname
   {\setfalse\c_grph_rotate_not_fit
    \setfalse\c_grph_rotate_center
    \setfalse\c_grph_rotate_obey_depth
    \grph_rotate_normal}
 
-\setvalue{\??rotatelocation\v!high}%
+\defcsname\??rotatelocation\v!high\endcsname
   {\setfalse\c_grph_rotate_not_fit
    \setfalse\c_grph_rotate_center
    \setfalse\c_grph_rotate_obey_depth
    \grph_rotate_framed}
 
-\setvalue{\??rotatelocation\v!middle}%
+\defcsname\??rotatelocation\v!middle\endcsname
   {\setfalse\c_grph_rotate_not_fit
    \settrue \c_grph_rotate_center
    \setfalse\c_grph_rotate_obey_depth  % hm, depth ?
    \grph_rotate_normal}
 
-\setvalue{\??rotatelocation\v!default}%
-  {\setfalse\c_grph_rotate_not_fit
-   \setfalse\c_grph_rotate_center
-   \settrue \c_grph_rotate_obey_depth
-   \grph_rotate_framed}
-
 \permanent\protected\def\dorotatebox#1% {angle} \hbox/\vbox/\vtop % a fast low level one
   {\ifcase#1\relax
      \expandafter\gobbleoneargument
@@ -901,22 +894,21 @@
 \def\grph_rotate_finish_nop
   {\boxcursor\box\nextbox}
 
-\setvalue{\??rotatepreset\v!left}%
+\defcsname\??rotatepreset\v!left\endcsname
   {\edef\p_rotation_rotation{90}}
 
-\setvalue{\??rotatepreset\v!right}%
+\defcsname\??rotatepreset\v!right\endcsname
   {\edef\p_rotation_rotation{270}}
 
-\setvalue{\??rotatepreset\v!inner}%
+\defcsname\??rotatepreset\v!inner\endcsname
   {\signalrightpage
    \doifelserightpage{\def\p_rotation_rotation{270}}{\def\p_rotation_rotation{90}}}
 
-\setvalue{\??rotatepreset\v!outer}%
+\defcsname\??rotatepreset\v!outer\endcsname
   {\signalrightpage
    \doifelserightpage{\def\p_rotation_rotation{90}}{\def\p_rotation_rotation{270}}}
 
-\setvalue{\??rotatepreset\v!default}%
-  {}
+\letcsname\??rotatepreset\v!default\endcsname\empty
 
 \def\grph_rotate_finish_yes
   {\begincsname\??rotatepreset\p_rotation_rotation\endcsname
diff --git a/tex/context/base/mkxl/lpdf-col.lmt b/tex/context/base/mkxl/lpdf-col.lmt
index 13f34fe46..778d250c6 100644
--- a/tex/context/base/mkxl/lpdf-col.lmt
+++ b/tex/context/base/mkxl/lpdf-col.lmt
@@ -777,7 +777,7 @@ do
     local function startcolor(k)
         local m, c = colortoattributes(k)
         local t = transparencytoattribute(k)
-        if t then
+        if t and t ~= unsetvalue then
             return t_cache[t][m][c]
         else
             return c_cache[m][c]
@@ -793,10 +793,11 @@ do
     backends.pdf.tables.vfspecials = vfspecials
 
     vfspecials.startcolor = startcolor
-    vfspecials.stopcolor  = { "pdf", "text", "Q" }
+ -- vfspecials.stopcolor  = { "pdf", "text", "Q" } -- fails
+    vfspecials.stopcolor  = { "pdf", "page", "Q" }
 
     vfspecials.startslant = startslant
-    vfspecials.stopslant  = { "pdf", "text", "Q" }
+    vfspecials.stopslant  = { "pdf", "page", "Q" } -- fails
 
 end
 
diff --git a/tex/context/base/mkxl/lpdf-lmt.lmt b/tex/context/base/mkxl/lpdf-lmt.lmt
index c02a35fe1..28cfff41d 100644
--- a/tex/context/base/mkxl/lpdf-lmt.lmt
+++ b/tex/context/base/mkxl/lpdf-lmt.lmt
@@ -1074,11 +1074,10 @@ local flushrule, flushsimplerule, flushspecialrule, flushimage, flushgroup  do
 
     -- place image also used in vf but we can use a different one if we need it
 
-    local imagetypes     = images.types -- pdf png jpg jp2 jbig2 stream memstream
+    local imagetypes     = images.types -- pdf png jpg jp2 jbig2 stream
     local img_none       = imagetypes.none
     local img_pdf        = imagetypes.pdf
     local img_stream     = imagetypes.stream
-    local img_memstream  = imagetypes.memstream
 
     local one_bp = 65536 * bpfactor
 
@@ -1158,7 +1157,7 @@ local flushrule, flushsimplerule, flushspecialrule, flushimage, flushgroup  do
 
         -- tricky: xsize and ysize swapped
 
-        if kind == img_pdf or kind == img_stream or kind == img_memstream then
+        if kind == img_pdf or kind == img_stream then
             rx, ry, tx, ty = 1/xsize, 1/ysize, xorigin/xsize, yorigin/ysize
         else
          -- if kind == img_png then
@@ -2621,7 +2620,7 @@ do -- updaters.register("backend.update.pdf",function()
 
     local codeinjections = backends.pdf.codeinjections
 
-    local imagetypes     = images.types -- pdf png jpg jp2 jbig2 stream memstream
+    local imagetypes     = images.types -- pdf png jpg jp2 jbig2 stream
     local img_none       = imagetypes.none
 
     local rulecodes      = nodes.rulecodes
diff --git a/tex/context/base/mkxl/lxml-ini.mkxl b/tex/context/base/mkxl/lxml-ini.mkxl
index f331718e9..01d0f883f 100644
--- a/tex/context/base/mkxl/lxml-ini.mkxl
+++ b/tex/context/base/mkxl/lxml-ini.mkxl
@@ -47,86 +47,22 @@
 
 \aliased\let\xmlload\xmlloadfile
 
-% aliased
-
-%let\xmlall                    \clf_xmlall
-%let\xmlatt                    \clf_xmlatt
-%let\xmlattdef                 \clf_xmlattdef
-%let\xmlattribute              \clf_xmlattribute
-%let\xmlattributedef           \clf_xmlattributedef
-%let\xmlbadinclusions          \clf_xmlbadinclusions
-%let\xmlchainatt               \clf_xmlchainatt
-%let\xmlchainattdef            \clf_xmlchainattdef
-%let\xmlchecknamespace         \clf_xmlchecknamespace
-%let\xmlcommand                \clf_xmlcommand
-%let\xmlcontext                \clf_xmlcontext
-%let\xmlcount                  \clf_xmlcount
-%let\xmldelete                 \clf_xmldelete
-%let\xmldirect                 \clf_xmldirect             % in loops, not dt but root
-%let\xmldirectives             \clf_xmldirectives
-%let\xmldirectivesafter        \clf_xmldirectivesafter
-%let\xmldirectivesbefore       \clf_xmldirectivesbefore
-%let\xmldisplayverbatim        \clf_xmldisplayverbatim
-%let\xmlelement                \clf_xmlelement
-%let\xmlfilter                 \clf_xmlfilter
-%let\xmlfilterlist             \clf_xmlfilterlist
-%let\xmlfirst                  \clf_xmlfirst
-%let\xmlflush                  \clf_xmlflush
-%let\xmlflushcontext           \clf_xmlflushcontext
-%let\xmlflushlinewise          \clf_xmlflushlinewise
-%let\xmlflushpure              \clf_xmlflushpure
-%let\xmlflushspacewise         \clf_xmlflushspacewise
-%let\xmlflushtext              \clf_xmlflushtext
-%let\xmlfunction               \clf_xmlfunction
-%let\xmlinclude                \clf_xmlinclude
-%let\xmlincludeoptions         \clf_xmlincludeoptions
-%let\xmlinclusion              \clf_xmlinclusion
-%let\xmlinclusionbase          \clf_xmlinclusionbase
-%let\xmlinclusions             \clf_xmlinclusions
-%let\xmlindex                  \clf_xmlindex
-%let\xmlinlineverbatim         \clf_xmlinlineverbatim
-%let\xmllast                   \clf_xmllast
-%let\xmllastatt                \clf_xmllastatt
-%let\xmllastmatch              \clf_xmllastmatch
-%let\xmllastpar                \clf_xmllastpar
-%let\xmlloaddirectives         \clf_xmlloaddirectives
-%let\xmlmain                   \clf_xmlmain
-%let\xmlmatch                  \clf_xmlmatch
-%let\xmlname                   \clf_xmlname
-%let\xmlnamespace              \clf_xmlnamespace
-%let\xmlnonspace               \clf_xmlnonspace
-%let\xmlpar                    \clf_xmlpar
-%let\xmlparam                  \clf_xmlparam
-%let\xmlpath                   \clf_xmlpath
-%let\xmlpopmatch               \clf_xmlpopmatch
-%let\xmlpos                    \clf_xmlpos
-%let\xmlpure                   \clf_xmlpure
-%let\xmlpushmatch              \clf_xmlpushmatch
-%let\xmlraw                    \clf_xmlraw
-%let\xmlrefatt                 \clf_xmlrefatt
-%let\xmlregisterns             \clf_xmlregisterns         % document
-%let\xmlremapname              \clf_xmlremapname          % element
-%let\xmlremapnamespace         \clf_xmlremapnamespace     % document
-%let\xmlsave                   \clf_xmlsave
-%let\xmlsetatt                 \clf_xmlsetatt
-%let\xmlsetattribute           \clf_xmlsetattribute
-%let\xmlsetpar                 \clf_xmlsetpar
-%let\xmlsetparam               \clf_xmlsetparam
-%let\xmlsetsetup               \clf_xmlsetsetup
-%let\xmlsnippet                \clf_xmlsnippet
-%let\xmlstrip                  \clf_xmlstrip
-%let\xmlstripanywhere          \clf_xmlstripanywhere
-%let\xmlstripnolines           \clf_xmlstripnolines
-%let\xmlstripped               \clf_xmlstripped
-%let\xmlstrippednolines        \clf_xmlstrippednolines
-%let\xmltag                    \clf_xmltag
-%let\xmltext                   \clf_xmltext
-%let\xmltobuffer               \clf_xmltobuffer           % id pattern name
-%let\xmltobuffertextonly       \clf_xmltobuffertextonly   % id pattern name
-%let\xmltobufferverbose        \clf_xmltobufferverbose    % id pattern name
-%let\xmltofile                 \clf_xmltofile             % id pattern filename
-%let\xmltoparameters           \clf_xmltoparameters
-%let\xmlverbatim               \clf_xmlverbatim
+%D These are defined at the \LUA\ end:
+
+% \xmlall \xmlatt \xmlattdef \xmlattribute \xmlattributedef \xmlbadinclusions
+% \xmlchainatt \xmlchainattdef \xmlchecknamespace \xmlcommand \xmlcontext \xmlcount
+% \xmldelete \xmldirect \xmldirectives \xmldirectivesafter \xmldirectivesbefore
+% \xmldisplayverbatim \xmlelement \xmlfilter \xmlfilterlist \xmlfirst \xmlflush
+% \xmlflushcontext \xmlflushlinewise \xmlflushpure \xmlflushspacewise \xmlflushtext
+% \xmlfunction \xmlinclude \xmlincludeoptions \xmlinclusion \xmlinclusionbase
+% \xmlinclusions \xmlindex \xmlinlineverbatim \xmllast \xmllastatt \xmllastmatch
+% \xmllastpar \xmlloaddirectives \xmlmain \xmlmatch \xmlname \xmlnamespace
+% \xmlnonspace \xmlpar \xmlparam \xmlpath \xmlpopmatch \xmlpos \xmlpure
+% \xmlpushmatch \xmlraw \xmlrefatt \xmlregisterns \xmlremapname \xmlremapnamespace
+% \xmlsave \xmlsetatt \xmlsetattribute \xmlsetpar \xmlsetparam \xmlsetsetup
+% \xmlsnippet \xmlstrip \xmlstripanywhere \xmlstripnolines \xmlstripped
+% \xmlstrippednolines \xmltag \xmltext \xmltobuffer \xmltobuffertextonly
+% \xmltobufferverbose \xmltofile \xmltoparameters \xmlverbatim
 
 \aliased\let\xmlposition\xmlindex
 
@@ -184,25 +120,11 @@
 \aliased\let\startxmlraw\clf_xmlstartraw
 \aliased\let\stopxmlraw \clf_xmlstopraw
 
-% these are expandable! todo: \xmldoifelseattribute
+% These are expandable and defined at the \LUA\ end:
 
-%let\xmldoif              \clf_xmldoif
-%let\xmldoifnot           \clf_xmldoifnot
-%let\xmldoifelse          \clf_xmldoifelse
-%let\xmldoiftext          \clf_xmldoiftext
-%let\xmldoifnottext       \clf_xmldoifnottext
-%let\xmldoifelsetext      \clf_xmldoifelsetext
-
-%let\xmldoifatt           \clf_xmldoifatt
-%let\xmldoifnotatt        \clf_xmldoifnotatt
-%let\xmldoifelseatt       \clf_xmldoifelseatt
-
-%let\xmldoifempty         \clf_xmldoifempty
-%let\xmldoifnotempty      \clf_xmldoifnotempty
-%let\xmldoifelseempty     \clf_xmldoifelseempty
-%let\xmldoifselfempty     \clf_xmldoifselfempty
-%let\xmldoifnotselfempty  \clf_xmldoifnotselfempty
-%let\xmldoifelseselfempty \clf_xmldoifelseselfempty
+% \xmldoif \xmldoifnot \xmldoifelse \xmldoiftext \xmldoifnottext \xmldoifelsetext
+% \xmldoifatt \xmldoifnotatt \xmldoifelseatt \xmldoifempty \xmldoifnotempty
+% \xmldoifelseempty \xmldoifselfempty \xmldoifnotselfempty \xmldoifelseselfempty
 
 \aliased\let\xmldoiftextelse      \xmldoifelsetext
 \aliased\let\xmldoifemptyelse     \xmldoifelseempty
@@ -519,26 +441,8 @@
 
 \aliased\let\xmlapplyselectors\clf_xmlapplyselectors
 
-% \let\xmlcatcodes\notcatcodes
+% In the\MKIV\ file there is some commented code wrt handing entities with active
+% characters ... very old and obsolete.
 
 \protect \endinput
 
-% \newcount\charactersactiveoffset \charactersactiveoffset="10000
-%
-% \startextendcatcodetable\ctxcatcodes
-%     \catcode\numexpr\charactersactiveoffset+`<\relax=13
-%     \catcode\numexpr\charactersactiveoffset+`&\relax=13
-%     \catcode\numexpr\charactersactiveoffset+`>\relax=13
-% \stopextendcatcodetable
-%
-% \startextendcatcodetable\xmlcatcodes % not needed
-%     \catcode\numexpr\charactersactiveoffset+`<\relax=13
-%     \catcode\numexpr\charactersactiveoffset+`&\relax=13
-%     \catcode\numexpr\charactersactiveoffset+`>\relax=13
-% \stopextendcatcodetable
-%
-% \ctxlua { % entities are remembered in the format
-%     commands.remapentity("<",characters.activeoffset + utf.byte("<"))
-%     commands.remapentity("&",characters.activeoffset + utf.byte("&"))
-%     commands.remapentity(">",characters.activeoffset + utf.byte(">"))
-% }
diff --git a/tex/context/base/mkxl/meta-fnt.lmt b/tex/context/base/mkxl/meta-fnt.lmt
index 627dbc746..a0feb0b52 100644
--- a/tex/context/base/mkxl/meta-fnt.lmt
+++ b/tex/context/base/mkxl/meta-fnt.lmt
@@ -6,257 +6,24 @@ if not modules then modules = { } end modules ['meta-fnt'] = {
     license   = "see context related readme files"
 }
 
-local next = next
-local concat     = table.concat
-local format     = string.format
-local formatters = string.formatters
-local chardata   = characters.data
-local fontdata   = fonts.hashes.identifiers
+-- This was one of the demo modules that never was used for real so the \MKIV\
+-- variant has been replaced by one using the newer \LMTX\ interface, but only
+-- because we want to be (sort of) compatible. Instead of doing the work at the
+-- \LUA\ end we do it at the \TEX end.
 
-local vffonts    = fonts.handlers.vf
-
-local mpfonts    = fonts.mp or { }
-fonts.mp         = mpfonts
-
-mpfonts.version  = mpfonts.version or 1.20
-mpfonts.inline   = true
-mpfonts.cache    = containers.define("fonts", "mp", mpfonts.version, true)
-
-metapost.fonts   = metapost.fonts or { }
-
-local function unicodetoactualtext(...)
-    unicodetoactualtext = backends.codeinjections.unicodetoactualtext
-    return unicodetoactualtext(...)
-end
-
--- a few glocals
-
-local characters, descriptions = { }, { }
-local factor, code, slot, width, height, depth, total, variants, bbox, llx, lly, urx, ury = 100, { }, 0, 0, 0, 0, 0, 0, true, 0, 0, 0, 0
-
-local flusher = {
-    startfigure = function(_chr_,_llx_,_lly_,_urx_,_ury_)
-        code   = { }
-        slot   = _chr_
-        llx    = _llx_
-        lly    = _lly_
-        urx    = _urx_
-        ury    = _ury_
-        width  = urx - llx
-        height = ury
-        depth  = -lly
-        total  = total + 1
-        inline = mpfonts.inline
-    end,
-    flushfigure = function(t)
-        for i=1,#t do
-            code[#code+1] = t[i]
-        end
-    end,
-    stopfigure = function()
-        local cd = chardata[n]
-        local code = unicodetoactualtext(slot,concat(code," ")) or ""
-        descriptions[slot] = {
-        --  unicode     = slot,
-            name        = cd and cd.adobename,
-            width       = width * 100,
-            height      = height * 100,
-            depth       = depth * 100,
-            boundingbox = { llx, lly, urx, ury },
-        }
-        if inline then
-            characters[slot] = {
-                commands = {
-                    { "pdf", "origin", code },
-                }
-            }
-        else
-            characters[slot] = {
-                commands = {
-                    {
-                        "image",
-                        {
-                            stream = code,
-                            bbox   = { 0, -depth * 65536, width * 65536, height * 65536 }
-                        },
-                    },
-                }
-            }
-        end
-        code = nil -- no need to keep that
-    end
-}
-
-local function process(mpxformat,name,instances,scalefactor)
-    local filename = resolvers.findfile(name)
-    local attributes = filename and lfs.isfile(filename) and lfs.attributes(filename)
-    if attributes then
-        statistics.starttiming(metapost.fonts)
-        scalefactor = scalefactor or 1
-        instances = instances or metapost.fonts.instances or 1 -- maybe store in liost too
-        local fontname = file.removesuffix(file.basename(name))
-        local modification = attributes.modification
-        local filesize = attributes.size
-        local hash = file.robustname(formatters["%s %05i %03i"](fontname,scalefactor*1000,instances))
-        local lists = containers.read(mpfonts.cache,hash)
-        if not lists or lists.modification ~= modification or lists.filesize ~= filesize or lists.instances ~= instances or lists.scalefactor ~= scalefactor then
-            statistics.starttiming(flusher)
-            local data = io.loaddata(filename)
-            metapost.reset(mpxformat)
-            metapost.setoutercolor(2) -- no outer color and no reset either
-            lists = { }
-            for i=1,instances do
-                characters   = { }
-                descriptions = { }
-                metapost.process {
-                    mpx         = mpxformat,
-                    flusher     = flusher,
-                    askedfig    = "all",
-                 -- incontext   = false,
-                    data        = {
-                        formatters["randomseed := %s ;"](i*10),
-                        formatters["charscale  := %s ;"](scalefactor),
-                        data,
-                    },
-                }
-                lists[i] = {
-                    characters   = characters,
-                    descriptions = descriptions,
-                    parameters   = {
-                        designsize    = 655360,
-                        slant         =      0,
-                        space         =    333   * scalefactor,
-                        space_stretch =    166.5 * scalefactor,
-                        space_shrink  =    111   * scalefactor,
-                        x_height      =    431   * scalefactor,
-                        quad          =   1000   * scalefactor,
-                        extra_space   =      0,
-                    },
-                    properties  = {
-                        name   = formatters["%s-%03i"](hash,i),
-                        spacer = "space",
-                    }
-                }
-            end
-            lists.version = metapost.variables.fontversion or "1.000"
-            lists.modification = modification
-            lists.filesize = filesize
-            lists.instances = instances
-            lists.scalefactor = scalefactor
-            metapost.reset(mpxformat) -- saves memory
-            lists = containers.write(mpfonts.cache, hash, lists)
-            statistics.stoptiming(flusher)
-        end
-        variants = variants + #lists
-        statistics.stoptiming(metapost.fonts)
-        return lists
-    else
-        return { }
-    end
-end
-
-metapost.fonts.flusher   = flusher
-metapost.fonts.instances = 1
-metapost.fonts.process   = process
-
-local function build(g,v)
-    local size = g.specification.size
-    local data = process(v[2],v[3],v[4],size/655360,v[6])
-    local list = { }
-    local t = { }
-    for d=1,#data do
-        t = fonts.constructors.scale(data[d],-1000)
-     -- local id = font.nextid()
-     -- t.fonts = { { id = id } }
-        fontdata[id] = t
-        if v[5] then
-            vffonts.helpers.composecharacters(t)
-        end
-        list[d] = font.define(t)
-    end
-    for k, v in next, t do -- last t
-        g[k] = v -- kind of replace, when not present, make nil
-    end
-    g.variants = list
-end
-
-vffonts.combiner.commands.metapost = build
-vffonts.combiner.commands.metafont = build
-
-statistics.register("metapost font generation", function()
-    if total > 0 then
-        local time = statistics.elapsedtime(flusher)
-        if total > 0 then
-            return format("%i glyphs, %s seconds runtime, %.1f glyphs/second", total, time, total/tonumber(time))
-        else
-            return format("%i glyphs, %s seconds runtime", total, time)
-        end
-    end
-end)
-
-statistics.register("metapost font loading",function()
-    if variants > 0 then
-        local time = statistics.elapsedtime(metapost.fonts)
-        if variants > 0 then
-            return format("%s seconds, %i instances, %.3f instances/second", time, variants, variants/tonumber(time))
-        else
-            return format("%s seconds, %i instances", time, variants)
-        end
-    end
-end)
-
--- fonts.definers.methods.install( "bidi", {
---     {
---         "metapost",    -- method
---         "metafun",     -- format
---         "fontoeps.mp", -- filename
---         1,             -- instances
---         false,         -- compose
---     },
--- } )
-
-local report = logs.reporter("metapost","fonts")
+metapost.fonts = metapost.fonts or { }
 
 function metapost.fonts.define(specification)
-    local fontname = specification.fontname or ""
-    local filename = specification.filename or ""
-    local format   = specification.format   or "metafun"
-    if fontname == "" then
-        report("no fontname given")
-        return
-    end
-    if filename == "" then
-        report("no filename given for %a",fontname)
-        return
-    end
-    local fullname = resolvers.findfile(filename)
-    if fullname == "" then
-        report("unable to locate file %a",filename)
-        return
-    end
-    report("generating font %a using format %a and file %a",fontname,format,filename)
-    fonts.definers.methods.install(fontname, {
-        {
-            specification.engine    or "metapost",
-            format,
-            filename,
-            specification.instances or 1,
-            specification.compose   or false,
-        },
-    } )
+    local fontname = specification.fontname
+    local filename = specification.filename
+    local fontsize = specification.size
+    context.definemetafont (
+        { fontname },
+        { filename },
+        { size and { "at " .. size .. " sp" } or "" }
+    )
 end
 
-interfaces.implement {
-    name      = "definemetafont",
-    actions   = metapost.fonts.define,
-    arguments = {
-        {
-            { "fontname" },
-            { "filename" },
-        }
-    }
-}
-
 -- metapost.fonts.define {
 --     fontname = "bidi",
 --     filename = "bidi-symbols.mp",
diff --git a/tex/context/base/mkxl/meta-fnt.mkxl b/tex/context/base/mkxl/meta-fnt.mkxl
index 9efee0ee5..0a2cab991 100644
--- a/tex/context/base/mkxl/meta-fnt.mkxl
+++ b/tex/context/base/mkxl/meta-fnt.mkxl
@@ -17,17 +17,27 @@
 
 \unprotect
 
-\permanent\tolerant\protected\def\definemetafont[#1]#*[#2]#*[#3]%
-  {\clf_definemetafont
-      fontname {#1}%
-      filename {#2}%
-      % no #3 settings yet (compose, instances)
-   \relax}
+%D Contrary to the \MKIV\ variant we dont' use the \LUA\ call but the \LUA\ call
+%D uses this here:
 
-% \startluacode
-%     metapost.fonts.define { fontname = "bidi-symbols", filename = "bidi-symbols.mp" }
-% \stopluacode
+\permanent\tolerant\protected\def\definemetafont[#1]#*[#2]#*[#3]%
+  {\doonlyonce{#2}{%
+     \definefontfeature[metafont-#2][metapost=#2]
+     \startMPcalculation{simplefun} input "#2" ; \stopMPcalculation
+   }%
+   \definefont[#1][Mono*metafont-#2 #3]}
 
-% \definemetafont[bidi-symbols][bidi-symbols.mp]
+%D Demo:
+%D
+%D \starttyping
+%D \setupbodyfont[dejavu]
+%D \starttext
+%D \showglyphs
+%D \startTEXpage[offset=10pt]
+%D     \definemetafont[MyDemoA][demo-symbols][at 10pt]\MyDemoA\char9754
+%D     \definemetafont[MyDemoB][demo-symbols][at 30pt]\MyDemoB\char9754
+%D \stopTEXpage
+%D \stoptext
+%D \stoptyping
 
 \protect \endinput
diff --git a/tex/context/base/mkxl/mlib-fio.lmt b/tex/context/base/mkxl/mlib-fio.lmt
index 4290537dd..895178b04 100644
--- a/tex/context/base/mkxl/mlib-fio.lmt
+++ b/tex/context/base/mkxl/mlib-fio.lmt
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['mlib-run'] = {
+if not modules then modules = { } end modules ['mlib-fio'] = {
     version   = 1.001,
     comment   = "companion to mlib-ctx.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
@@ -80,7 +80,9 @@ local function writetoterminal(terminaldata,maxterm,d)
     elseif t == "table" then
         for i=1,#d do
             local l = d[i]
-            if find(l,"[\n\r]") then
+            if not l then
+                -- just ignore
+            elseif find(l,"[\n\r]") then
                 local s = splitlines(l)
                 local m = #s
                 for i=1,m do
@@ -177,10 +179,45 @@ local function finder(name,mode,kind)
     return findtexfile(name,kind)
 end
 
+local overloadmode = "warning"
+
+directives.register("metapost.overloadmode",function(v)
+    if v == "warning" or v == "error" then
+        overloadmode = v
+    else
+        overloadmode= false
+    end
+end)
+
+local propertycodes = {
+    [-3] = "mutable",
+    [ 1] = "primitive",
+    [ 2] = "permanent",
+    [ 3] = "immutable",
+}
+
+mplib.propertycodes = propertycodes
+
+local function overload(property,name)
+    if overloadmode then
+        -- turn of warning after format is loaded
+        report_metapost("overloading %s %a",propertycodes[property] or "unknown", name)
+        -- no overload permitted
+        if overloadmode == "error" then
+            luatex.abort()
+        end
+        return false
+    else
+        -- overload permitted
+        return true
+    end
+end
+
 function mplib.new(specification)
     local openfile = fileopener()
     specification.find_file     = finder
     specification.run_logger    = logger
+    specification.run_overload  = overload
     specification.open_file     = openfile
     specification.interaction   = "silent"
     specification.halt_on_error = true
diff --git a/tex/context/base/mkxl/mlib-int.lmt b/tex/context/base/mkxl/mlib-int.lmt
index 86e2e5732..3ea270a79 100644
--- a/tex/context/base/mkxl/mlib-int.lmt
+++ b/tex/context/base/mkxl/mlib-int.lmt
@@ -18,10 +18,11 @@ local exheights      = fonts.hashes.exheights
 
 local registerscript = metapost.registerscript
 
-local on_right_page  = structures.pages.on_right
-local is_odd_page    = structures.pages.is_odd
-local in_body_page   = structures.pages.in_body
-local page_fraction  = structures.pages.fraction
+local on_right_page      = structures.pages.on_right
+local is_odd_page        = structures.pages.is_odd
+local in_body_page       = structures.pages.in_body
+local page_fraction      = structures.pages.fraction
+local layout_has_changed = structures.pages.has_changed
 
 local function defaultcolormodel() -- can be helper
     local colormethod = getcount("MPcolormethod")
@@ -127,9 +128,10 @@ registerscript("OverlayRegion",        function() mpstring(getmacro("m_overlay_r
 --
 -- registerscript("PageFraction",       page_fraction)
 
-registerscript("PageFraction",         function() return mpboolean(page_fraction()) end)
-registerscript("OnRightPage",          function() return mpboolean(on_right_page()) end)
-registerscript("OnOddPage",            function() return mpboolean(is_odd_page  ()) end)
-registerscript("InPageBody",           function() return mpboolean(in_body_page ()) end)
+registerscript("PageFraction",         function() return mpboolean(page_fraction     ()) end)
+registerscript("OnRightPage",          function() return mpboolean(on_right_page     ()) end)
+registerscript("OnOddPage",            function() return mpboolean(is_odd_page       ()) end)
+registerscript("InPageBody",           function() return mpboolean(in_body_page      ()) end)
+registerscript("LayoutHasChanged",     function() return mpboolean(layout_has_changed()) end)
 
 registerscript("defaultcolormodel",    defaultcolormodel)
diff --git a/tex/context/base/mkxl/mlib-lmt.lmt b/tex/context/base/mkxl/mlib-lmt.lmt
index f0b59248a..355674582 100644
--- a/tex/context/base/mkxl/mlib-lmt.lmt
+++ b/tex/context/base/mkxl/mlib-lmt.lmt
@@ -10,15 +10,16 @@ if not modules then modules = { } end modules ['mlib-lmt'] = {
 
 local type = type
 
-local aux          = mp.aux
-local mpdirect     = aux.direct
-local mppath       = mp.path
+local aux            = mp.aux
+local mpdirect       = aux.direct
+local mppath         = mp.path
 
-local scan         = mp.scan
-local scannumeric  = scan.numeric
-local scanpath     = scan.path
+local scan           = mp.scan
+local scannumeric    = scan.numeric
+local scanpath       = scan.path
 
-local getparameter = metapost.getparameter
+local getparameter   = metapost.getparameter
+local registerscript = metapost.registerscript
 
 function mp.lmt_function_x(xmin,xmax,xstep,code,shape) -- experimental
     local code      = "return function(x) return " .. code .. " end"
@@ -126,27 +127,21 @@ function mp.lmt_svg_include()
     end
 end
 
-
-function mp.lmt_do_remaptext()
+registerscript("remaptext", function()
     local parameters = metapost.scanparameters()
     if parameters and parameters.label then
         metapost.remaptext(parameters)
     end
-end
+end)
 
 do
 
     local dropins        = fonts.dropins
-    local registerglyphs = dropins.registerglyphs
     local registerglyph  = dropins.registerglyph
+    local registerglyphs = dropins.registerglyphs
 
-    function mp.lmt_register_glyph()
-        registerglyph(metapost.getparameterset("mpsglyph"))
-    end
-
-    function mp.lmt_register_glyphs()
-        registerglyphs(metapost.getparameterset("mpsglyphs"))
-    end
+    registerscript("registerglyph", function() registerglyph (metapost.getparameterset("mpsglyph"))  end)
+    registerscript("registerglyphs",function() registerglyphs(metapost.getparameterset("mpsglyphs")) end)
 
 end
 
diff --git a/tex/context/base/mkxl/mlib-pdf.lmt b/tex/context/base/mkxl/mlib-pdf.lmt
index e737b5d86..c1f5045d7 100644
--- a/tex/context/base/mkxl/mlib-pdf.lmt
+++ b/tex/context/base/mkxl/mlib-pdf.lmt
@@ -348,17 +348,17 @@ end
 --     lpegmatch(pattern_key,object.prescript,1,variables)
 -- end
 
-function metapost.processspecial(str)
-    local code = loadstring(str)
-    if code then
-        if trace_variables then
-            report_metapost("executing special code: %s",str)
-        end
-        code()
-    else
-        report_metapost("invalid special code: %s",str)
-    end
-end
+-- function metapost.processspecial(str)
+--     local code = loadstring(str)
+--     if code then
+--         if trace_variables then
+--             report_metapost("executing special code: %s",str)
+--         end
+--         code()
+--     else
+--         report_metapost("invalid special code: %s",str)
+--     end
+-- end
 
 local stack = { }
 
@@ -407,7 +407,7 @@ function metapost.flush(specification,result)
             local stopfigure         = flusher.stopfigure
             local flushfigure        = flusher.flushfigure
             local textfigure         = flusher.textfigure
-            local processspecial     = flusher.processspecial or metapost.processspecial
+         -- local processspecial     = flusher.processspecial or metapost.processspecial
             metapost.comment         = flusher.comment or nocomment
             for index=1,#figures do
                 local figure     = figures[index]
@@ -443,58 +443,7 @@ function metapost.flush(specification,result)
                                 for o=1,#objects do
                                     local object = objects[o]
                                     local objecttype = object.type
-                                    if objecttype == "text" then
-                                        result[#result+1] = "q"
-                                        local ot = object.transform -- 3,4,5,6,1,2
-                                        result[#result+1] = f_cm(ot[3],ot[4],ot[5],ot[6],ot[1],ot[2])
-                                        flushfigure(result) -- flush accumulated literals
-                                        result = { }
-                                        textfigure(object.font,object.dsize,object.text,object.width,object.height,object.depth)
-                                        result[#result+1] = "Q"
-                                    elseif objecttype == "special" then
-                                        if processspecial then
-                                            processspecial(object.prescript)
-                                        end
-                                    elseif objecttype == "start_clip" then
-                                        local evenodd = not object.istext and object.postscript == "evenodd"
-                                        result[#result+1] = "q"
-                                        flushnormalpath(object.path,result,false)
-                                        result[#result+1] = evenodd and "W* n" or "W n"
-                                    elseif objecttype == "stop_clip" then
-                                        result[#result+1] = "Q"
-                                        miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
-                                    elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then
-                                        -- skip
-                                    elseif objecttype == "start_group" then
-                                        if lpdf.flushgroup then
-                                            local before, after = processplugins(object)
-                                            if before then
-                                                result[#result+1] = "q"
-                                                result = pluginactions(before,result,flushfigure)
-                                                insert(groupstack, {
-                                                    after  = after,
-                                                    result = result,
-                                                    bbox   = toboundingbox(object.path),
-                                                })
-                                                result = { }
-                                                miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
-                                            else
-                                                insert(groupstack,false)
-                                            end
-                                        else
-                                            insert(groupstack,false)
-                                        end
-                                    elseif objecttype == "stop_group" then
-                                        local data = remove(groupstack)
-                                        if data then
-                                            local reference = lpdf.flushgroup(concat(result,"\r"),data.bbox)
-                                            result = data.result
-                                            result[#result+1] = reference
-                                            result = pluginactions(data.after,result,flushfigure)
-                                            result[#result+1] = "Q"
-                                            miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
-                                        end
-                                    else
+                                    if objecttype == "fill" or objecttype == "outline" then
                                         -- we use an indirect table as we want to overload
                                         -- entries but this is not possible in userdata
                                         --
@@ -676,6 +625,60 @@ function metapost.flush(specification,result)
                                             -- can be qQ'd so changes can end up in groups
                                             miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
                                         end
+                                    elseif objecttype == "start_clip" then
+                                        local evenodd = not object.istext and object.postscript == "evenodd"
+                                        result[#result+1] = "q"
+                                        flushnormalpath(object.path,result,false)
+                                        result[#result+1] = evenodd and "W* n" or "W n"
+                                    elseif objecttype == "stop_clip" then
+                                        result[#result+1] = "Q"
+                                        miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
+                                    elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then
+                                        -- skip
+                                    elseif objecttype == "start_group" then
+                                        if lpdf.flushgroup then
+                                            local before, after = processplugins(object)
+                                            if before then
+                                                result[#result+1] = "q"
+                                                result = pluginactions(before,result,flushfigure)
+                                                insert(groupstack, {
+                                                    after  = after,
+                                                    result = result,
+                                                    bbox   = toboundingbox(object.path),
+                                                })
+                                                result = { }
+                                                miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
+                                            else
+                                                insert(groupstack,false)
+                                            end
+                                        else
+                                            insert(groupstack,false)
+                                        end
+                                    elseif objecttype == "stop_group" then
+                                        local data = remove(groupstack)
+                                        if data then
+                                            local reference = lpdf.flushgroup(concat(result,"\r"),data.bbox)
+                                            result = data.result
+                                            result[#result+1] = reference
+                                            result = pluginactions(data.after,result,flushfigure)
+                                            result[#result+1] = "Q"
+                                            miterlimit, linecap, linejoin, dashed, linewidth = -1, -1, -1, "", false
+                                        end
+                                 -- if objecttype == "text" then
+                                 --     result[#result+1] = "q"
+                                 --     local ot = object.transform -- 3,4,5,6,1,2
+                                 --     result[#result+1] = f_cm(ot[3],ot[4],ot[5],ot[6],ot[1],ot[2])
+                                 --     flushfigure(result) -- flush accumulated literals
+                                 --     result = { }
+                                 --     textfigure(object.font,object.dsize,object.text,object.width,object.height,object.depth)
+                                 --     result[#result+1] = "Q"
+                                 -- elseif objecttype == "special" then
+                                 --     if processspecial then
+                                 --         processspecial(object.prescript)
+                                 --     end
+                                 -- else
+                                    else
+                                        -- error
                                     end
                                 end
                             end
diff --git a/tex/context/base/mkxl/mlib-run.lmt b/tex/context/base/mkxl/mlib-run.lmt
index 602d6f36c..2af504feb 100644
--- a/tex/context/base/mkxl/mlib-run.lmt
+++ b/tex/context/base/mkxl/mlib-run.lmt
@@ -31,7 +31,7 @@ nears zero.</p>
 
 local type, tostring, tonumber, next = type, tostring, tonumber, next
 local find, striplines = string.find, utilities.strings.striplines
-local concat, insert, remove = table.concat, table.insert, table.remove
+local concat, insert, remove, sortedkeys = table.concat, table.insert, table.remove, table.sortedkeys
 
 local emptystring = string.is_empty
 
@@ -641,6 +641,9 @@ do
             format   = "metafun", -- or: minifun
             method   = "double",
         }
+--         if not code then
+--             code = ""
+--         end
         metapost.process {
             mpx        = mpx,
             flusher    = flusher,
@@ -661,7 +664,7 @@ do
 
 end
 
-local getstatistics = mplib.getstatistics or mplib.statistics
+local getstatistics = mplib.getstatistics
 
 function metapost.getstatistics(memonly)
     if memonly then
@@ -679,3 +682,26 @@ function metapost.getstatistics(memonly)
         return t
     end
 end
+
+local gethashentries = mplib.gethashentries
+
+function metapost.gethashentries(name,full)
+    if name then
+        local mpx = mpxformats[name] or mpxformats[name .. ":1"]
+        if mpx then
+            return gethashentries(mpx,full)
+        end
+    else
+        local t = { }
+        for name, mpx in next, mpxformats do
+            t[name] = gethashtokens(mpx,full)
+        end
+        return t
+    end
+end
+
+local gethashtokens = mplib.gethashtokens
+
+function metapost.getinstancenames()
+    return sortedkeys(mpxformats)
+end
diff --git a/tex/context/base/mkxl/page-lay.mkxl b/tex/context/base/mkxl/page-lay.mkxl
index 6cd0d9579..01098ae3b 100644
--- a/tex/context/base/mkxl/page-lay.mkxl
+++ b/tex/context/base/mkxl/page-lay.mkxl
@@ -123,6 +123,8 @@
     \doifnothing{\directlayoutparameter\c!state}{\letlayoutparameter\c!state\v!start}%
 \to \everydefinelayout
 
+\newconditional \layouthaschanged \settrue\layouthaschanged % used in mp
+
 \appendtoks
     \ifcase\layoutsetupmode
         % can't happen
@@ -153,8 +155,13 @@
       \page_layouts_synchronize
       \page_layouts_check_next
     \fi
+    \global\settrue\layouthaschanged
 \to \everysetuplayout
 
+\appendtoks
+    \global\setfalse\layouthaschanged
+\to \everyaftershipout
+
 \permanent\def\doifelselayoutdefined#1%
   {\ifcsname\namedlayouthash{#1}\c!state\endcsname % maybe a helper
       \expandafter\firstoftwoarguments
diff --git a/tex/context/base/mkxl/syst-lua.lmt b/tex/context/base/mkxl/syst-lua.lmt
index 673c99ae3..faad64ff0 100644
--- a/tex/context/base/mkxl/syst-lua.lmt
+++ b/tex/context/base/mkxl/syst-lua.lmt
@@ -313,10 +313,11 @@ end
 do
 
     -- This is some 20% slower than native but we only provide this for compatibility
-    -- reasons so we don't care that much about it. Eventually we can drop the
-    -- built-in method.
+    -- reasons so we don't care that much about it. Eventually we can drop the built-in
+    -- method.
 
     local channels = { }
+    local lastdone = { }
 
     local findbinfile = resolvers.findbinfile
     local loadbinfile = resolvers.loadbinfile
@@ -328,7 +329,20 @@ do
     local scancsname  = tokens.scanners.csname
 
     local setmacro    = tokens.setters.macro
-    local vrbcatcodes = tex.vrbcatcodes
+    local rlncatcodes = tex.rlncatcodes
+    local texgetcount = tex.getcount
+
+    local bytes       = string.bytes
+    local getcatcode  = tex.getcatcode
+
+    local char, concat = string.char, table.concat
+
+    -- This uses the normal bin lookup method that we also use for other files,
+    -- and in principle there is no limit on the amount of files other than the
+    -- operating system imposes.
+
+    local t = { }
+    local l = 0
 
     implement {
         name      = "openin",
@@ -345,8 +359,10 @@ do
             local f = findbinfile(s,"tex")
             if f then
                 channels[n] = opentexfile(f)
+                lastdone[n] = false
             else
                 channels[n] = false
+                lastdone[n] = true
             end
         end,
     }
@@ -362,10 +378,19 @@ do
                 c:close()
             end
             channels[n] = false
+            t = { }
         end,
     }
 
-    implement {
+    -- This is not the fastest routine but hardly used, occasionally for line by line
+    -- input in e.g. tikz which is not that fast anyway so I'll deal with it when it
+    -- really is a bottleneck.
+
+    local readerror = function(what,n)
+        tex.error(string.formatters["too many %s brace tokens in read from channel %i"](what,n))
+    end
+
+    interfaces.implement {
         name      = "read",
         public    = true,
         usage     = "value",
@@ -374,18 +399,67 @@ do
                       scankeyword("to")
             local m = scancsname(true)
             local c = channels[n]
-            local s = c and c:reader()
-            if s then
-                s = gsub(s," *$"," ") -- or just "", no need to fake tex here
+            local g = 0
+            local s
+            l = 0
+            if c then
+                while true do
+                    local s = c and c:reader()
+                    if s then
+                        l = l + 1
+                        s = gsub(s," *$","")
+                        t[l] = s
+                        for c in bytes(s) do
+                            local cc = getcatcode(c)
+                            if cc == 1 then
+                                g = g + 1
+                            elseif cc == 2 then
+                                g = g - 1
+                            end
+                        end
+                        if g <= 0 then
+                            break
+                        end
+                    else
+                        break
+                    end
+                end
+                if g > 0 then
+                    readerror("left",n)
+                    s = ""
+                elseif g < 0 then
+                    readerror("right",n)
+                    s = ""
+                elseif l == 0 then
+                    if c:endoffile() then
+                        lastdone[n] = true
+                        s = "\\par"
+                    else
+                        s = ""
+                    end
+                    channels[n] = false
+                else
+                    local e = texgetcount("endlinechar") -- we can have tex.endline if needed
+                    if e < 0 or e > 127 then
+                        e = ""
+                    else
+                        e = " "
+                        l = l + 1
+                        t[l] = ""
+                    end
+                    s = concat(t, e, 1, l)
+                end
             else
-                channels[n] = false
-             -- s = "\\par"
-                s = "" -- no need to fake tex here
+                s = ""
             end
             setmacro(m, s, prefix) -- checks for frozen
         end,
     }
 
+    -- This is an etex extension. All characters become catcode 12 but a space gets code
+    -- 10. The etex manual specifies a lineending of catcode 12 too. Should we strip spaces
+    -- at the end? A bit weird command that we never use anyway.
+
     implement {
         name      = "readline",
         public    = true,
@@ -397,15 +471,21 @@ do
             local c = channels[n]
             local s = c and c:reader()
             if s then
-                -- should we strip spaces at the end?
+                local e = texgetcount("endlinechar") -- we can have tex.endline if needed
+                if e > 0 then -- forget about 0
+                    s = s .. char(e)
+                end
             else
                 channels[n] = false
                 s = ""
             end
-            setmacro(vrbcatcodes, m, s, prefix) -- checks for frozen
+            setmacro(rlncatcodes, m, s, prefix) -- checks for frozen
         end,
     }
 
+    -- This one uses the special lua condition option which is kind of experimental
+    -- but seems to work fine.
+
     local boolean_value = tokens.values.boolean
 
     implement {
@@ -418,7 +498,8 @@ do
         end,
     }
 
-    -- for the moment here:
+    -- This one doesn't belong here and it might become a real primitive if we need it
+    -- frequently. So, for the moment we keep it in this file.
 
     local getnest = tex.getnest
 
diff --git a/tex/context/base/mkxl/trac-inf.lmt b/tex/context/base/mkxl/trac-inf.lmt
index 23000b7d0..301a56e9b 100644
--- a/tex/context/base/mkxl/trac-inf.lmt
+++ b/tex/context/base/mkxl/trac-inf.lmt
@@ -179,9 +179,10 @@ function statistics.show()
         end)
         register("tex properties", function()
             local t = status.gethashstate()
+            local l = status.getlookupstate()
             local m = status.gettexstate()
-            return format("%s hash slots used of %s, approximate memory usage: %i MB",
-                t.top, t.max, m.approximate // (1024 * 1024))
+            return format("%s hash slots used of %s, %s control sequences, approximate memory usage: %i MB",
+                t.top, t.max, l.ptr, m.approximate // (1024 * 1024))
         end)
         register("callbacks", statistics.callbacks)
         -- so far
diff --git a/tex/context/modules/mkiv/m-tikz.mkiv b/tex/context/modules/mkiv/m-tikz.mkiv
index 73124716b..e04d53156 100644
--- a/tex/context/modules/mkiv/m-tikz.mkiv
+++ b/tex/context/modules/mkiv/m-tikz.mkiv
@@ -25,8 +25,12 @@
 
 \popcatcodetable
 
+\protected\def\tikzerrormessage#1#2#3%
+  {\writestatus{#1}{#2}}
+
 \protected\def\starttikzpicture
   {\begingroup
+   \ifdefined\PackageError\else \let\PackageError\tikzerrormessage \fi
    \overloadmode\zerocount
    \tikzpicture}
 
@@ -34,5 +38,4 @@
   {\endtikzpicture
    \endgroup}
 
-
 \stopmodule
diff --git a/tex/context/modules/mkiv/s-system-macros.mkxl b/tex/context/modules/mkiv/s-system-macros.mkxl
index 6dcccd048..63ac17913 100644
--- a/tex/context/modules/mkiv/s-system-macros.mkxl
+++ b/tex/context/modules/mkiv/s-system-macros.mkxl
@@ -15,8 +15,17 @@
 %D to the more robust \LMTX.
 
 % todo:  \permanent\protected\let\select\directselect : same value (add ref)
-
-% todo: when mutable, remove immutable
+%
+% todo: when mutable, remove immutable, decide on how immutable it really is
+%
+% todo: just for the fun of it we can compare the table generated here to mkiv but it
+% needs the same hash exposure as we use in luametatex so i'll do that after all lmtx
+% macros are checked (maybe i need to backport some more but it has a low priority)
+%
+% todo: do we need something similar for lua functions etc (problem: performance hit)
+%
+% todo: and how about metapost ... i need a mp.hashtokens in order to do that and I also
+% need to think about protection there (tricky as we use an avl hash there)
 
 \startmodule[system-macros]
 
@@ -106,7 +115,7 @@
                 local permanent  = v.permanent  and "permanent"
                 local primitive  = v.primitive  and "primitive"
                 local instance   = v.instance   and "instance"
-                local dealtwith  = mutable or immutable or frozen or permanent or primitive -- beware: we can have combinations
+                local dealtwith  = mutable or immutable or mutable or frozen or permanent or primitive -- beware: we can have combinations
                 local whatever   = find(k,"^[a-z][a-z][a-z]+_")
                 local cscommand  = gsub(v.cmdname or "","_"," ")
                 local undefined  = cscommand == "undefined cs"
@@ -146,14 +155,17 @@ end
         context.stoptabulate()
     end
 
-    show(true, function(k) return find(k,"^[a-zA-Z]+$") end)
-
-    context.page()
+    context.starttitle { title = "Public \\TEX\\ commands" }
+            show(true, function(k) return find(k,"^[a-zA-Z]+$") end)
+    context.stoptitle()
 
-    show(false, function(k) return not find(k,"^[a-zA-Z]+$") and not find(k,crap) end)
+    context.starttitle { title = "Private \\TEX\\ commands" }
+        show(false, function(k) return not find(k,"^[a-zA-Z]+$") and not find(k,crap) end)
+    context.stoptitle()
 
-    tokens.setters.macro("NumberOfVisible",  total)
+    tokens.setters.macro("NumberOfVisible", total)
     tokens.setters.macro("NumberOfFlagged", flagged)
+
 \stopluacode
 
 \page
@@ -175,9 +187,97 @@ the core of \CONTEXT. Noaligned macros are special and dealt deep down when
 scanning for alignment specific primitives.
 \par \stop
 
-\starttabulate
-\BC number of visible macros \NC \NumberOfVisible \NC \NR
-\BC number of flagged macros \NC \NumberOfFlagged \NC \NR
+\starttabulate[||r|]
+\BC number of visible macros  \NC \NumberOfVisible \NC \NR
+\BC number of flagged macros  \NC \NumberOfFlagged \NC \NR
+\stoptabulate
+
+\page
+
+% \startMPcalculation
+%     % force a format
+% \stopMPcalculation
+
+\startluacode
+
+    local context  = context
+ -- local ctx_NC   = context.NC
+ -- local ctx_NR   = context.NR
+ -- local ctx_bold = context.bold
+
+    local find     = string.find
+    local gsub     = string.gsub
+    local create   = token.create
+
+    context.starttitle { title = "\\METAFUN\\ commands" }
+
+        metapost.simple("prestine")
+
+        local mptotal  = 0
+        local codes    = metapost.codes
+        local types    = metapost.types
+        local procodes = mplib.propertycodes
+
+        context.startcolumns { n = 5, distance = "1em" }
+            context.nohyphens(false)
+            context.obeyspaces(false)
+            local t = metapost.gethashentries("prestine",true) -- prestine:1
+            if t then
+                table.sort(t,function(a,b) return a[3] < b[3] end)
+                mptotal = #t
+                for i=1,mptotal do
+                    local ti       = t[i]
+                    local code     = codes[ti[1]]
+                    local property = procodes[ti[2]]
+                    local name     = ti[3]
+                    local vtype    = ti[4]
+                    local vardef   = vtype and types[vtype] == "unsuffixedmacro"
+                    context.bgroup()
+                    context("%-15s\\quad",vardef and "(vardef) tag" or code)
+                    if property == "primitive" then
+                        context.bf(false)
+                        context.blue(false)
+                    elseif property == "permanent"  then
+                        context.bf(false)
+                        context.lightgreen(false)
+                    elseif property == "immutable"  then
+                        context.bf(false)
+                        context.lightcyan(false)
+                    elseif property == "mutable"  then
+                        context.bf(false)
+                        context.lightmagenta(false)
+                    elseif not find(name,"^%a+_") then
+                        -- todo:
+                        if vardef then
+                            context.bf(false)
+                            context.lightred(false)
+                        end
+                    end
+                    context.verbatim(name)
+                    context.egroup()
+                    context.par()
+                end
+            end
+        context.stopcolumns()
+
+    context.stoptitle()
+
+    tokens.setters.macro("NumberOfMetafun", mptotal)
+\stopluacode
+
+\page
+
+\starttabulate[|c|l|]
+\HL
+\NC \type {-3} \NC \bf \lightmagenta mutable   \NC \NR
+\NC \type  {1} \NC \bf \blue         primitive \NC \NR
+\NC \type  {2} \NC \bf \lightgreen   permanent \NC \NR
+\NC \type  {3} \NC \bf \lightcyan    immutable \NC \NR
+\HL
+\stoptabulate
+
+\starttabulate[||r|]
+\BC number of metafun entries \NC \NumberOfMetafun \NC \NR
 \stoptabulate
 
 \stoptext
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b40f2c8f2..256bf1175 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  : 2020-12-10 22:23
+-- merge date  : 2020-12-15 10:10
 
 do -- begin closure to overcome local limits and interference