2017-06-19 15:35:00

1 files changed, 85 insertions, 248 deletions

diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index b55ac229d..69221db12 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -1,17 +1,9 @@
--- the tex table has overlap
-
 return {
  ["aleph"]={
   "AlephVersion",
   "Alephminorversion",
   "Alephrevision",
   "Alephversion",
-  "Omegaminorversion",
-  "Omegarevision",
-  "Omegaversion",
-  "boxdir",
-  "pagebottomoffset",
-  "pagerightoffset",
  },
  ["etex"]={
   "botmarks",
@@ -85,9 +77,7 @@ return {
   "Udelimiterover",
   "Udelimiterunder",
   "Uhextensible",
-  "Uleft",
   "Umathaccent",
---"Umathaccents",
   "Umathaxis",
   "Umathbinbinspacing",
   "Umathbinclosespacing",
@@ -97,7 +87,6 @@ return {
   "Umathbinordspacing",
   "Umathbinpunctspacing",
   "Umathbinrelspacing",
---"Umathbotaccent",
   "Umathchar",
   "Umathcharclass",
   "Umathchardef",
@@ -115,7 +104,6 @@ return {
   "Umathcloserelspacing",
   "Umathcode",
   "Umathcodenum",
-  "Umathcodenumdef",
   "Umathconnectoroverlapmin",
   "Umathfractiondelsize",
   "Umathfractiondenomdown",
@@ -137,6 +125,8 @@ return {
   "Umathlimitbelowbgap",
   "Umathlimitbelowkern",
   "Umathlimitbelowvgap",
+  "Umathnolimitsubfactor",
+  "Umathnolimitsupfactor",
   "Umathopbinspacing",
   "Umathopclosespacing",
   "Umathopenbinspacing",
@@ -210,12 +200,10 @@ return {
   "Umathunderbarvgap",
   "Umathunderdelimiterbgap",
   "Umathunderdelimitervgap",
-  "Umathnolimitsupfactor",
-  "Umathnolimitsubfactor",
-  "Umiddle",
+  "Unosubscript",
+  "Unosuperscript",
   "Uoverdelimiter",
   "Uradical",
-  "Uright",
   "Uroot",
   "Uskewed",
   "Uskewedwithdelims",
@@ -226,8 +214,6 @@ return {
   "Ustopmath",
   "Usubscript",
   "Usuperscript",
-  "Unosubscript",
-  "Unosuperscript",
   "Uunderdelimiter",
   "Uvextensible",
   "adjustspacing",
@@ -235,14 +221,11 @@ return {
   "aligntab",
   "attribute",
   "attributedef",
-  "hyphenpenaltymode",
+  "automaticdiscretionary",
   "automatichyphenmode",
   "automatichyphenpenalty",
-  "automaticdiscretionary",
-  "explicithyphenpenalty",
-  "explicitdiscretionary",
+  "begincsname",
   "bodydir",
-  "boundary",
   "boxdir",
   "catcodetable",
   "clearmarks",
@@ -256,19 +239,27 @@ return {
   "dvifeedback",
   "dvivariable",
   "efcode",
-  "hjcode",
-  "firstvalidlanguage",
+  "etoksapp",
+  "etokspre",
+  "expanded",
+  "expandglyphsinfont",
+  "explicitdiscretionary",
+  "explicithyphenpenalty",
   "fontid",
   "formatname",
   "gleaders",
-  "hyphenationmin",
+  "hjcode",
   "hyphenationbounds",
+  "hyphenationmin",
+  "hyphenpenaltymode",
   "ifabsdim",
   "ifabsnum",
+  "ifincsname",
   "ifprimitive",
   "ignoreligaturesinfont",
   "initcatcodetable",
   "insertht",
+  "lastnamedcs",
   "lastsavedboxresourceindex",
   "lastsavedimageresourceindex",
   "lastsavedimageresourcepages",
@@ -286,34 +277,34 @@ return {
   "localrightbox",
   "lpcode",
   "luaescapestring",
+  "luafunction",
   "luatexbanner",
   "luatexrevision",
   "luatexversion",
-  "luafunction",
   "mathdir",
   "mathdisplayskipmode",
   "matheqnogapstep",
   "mathitalicsmode",
   "mathnolimitsmode",
   "mathoption",
+  "mathpenaltiesmode",
+  "mathrulesfam",
+  "mathrulesmode",
   "mathscriptsmode",
   "mathstyle",
-  "mathsurroundskip",
   "mathsurroundmode",
-  "mathrulesmode",
-  "mathrulesfam",
-  "noboundary",
-  "nokerns",
+  "mathsurroundskip",
   "nohrule",
+  "nokerns",
   "noligs",
+  "normaldeviate",
   "nospaces",
   "novrule",
-  "normaldeviate",
   "outputbox",
   "outputmode",
+  "pagebottomoffset",
   "pagedir",
   "pageheight",
-  "pagebottomoffset",
   "pageleftoffset",
   "pagerightoffset",
   "pagetopoffset",
@@ -322,15 +313,17 @@ return {
   "pdfextension",
   "pdffeedback",
   "pdfvariable",
+  "postdisplaypenalty",
   "postexhyphenchar",
   "posthyphenchar",
   "predisplaygapfactor",
+  "predisplaypenalty",
   "preexhyphenchar",
   "prehyphenchar",
   "primitive",
   "protrudechars",
-  "protrusionboundary",
   "pxdimen",
+  "quitvmode",
   "randomseed",
   "rightghost",
   "rightmarginkern",
@@ -346,41 +339,22 @@ return {
   "suppressfontnotfounderror",
   "suppressifcsnameerror",
   "suppresslongerror",
-  "suppressoutererror",
   "suppressmathparerror",
+  "suppressoutererror",
   "synctex",
   "tagcode",
   "textdir",
+  "toksapp",
+  "tokspre",
   "tracingfonts",
   "uniformdeviate",
   "useboxresource",
   "useimageresource",
-  "wordboundary",
-  --
-  "vpack",
-  "hpack",
-  "tpack",
-  "csstring",
-  "begincsname",
-  "lastnamedcs",
-  "toksapp",
-  "tokspre",
-  "etoksapp",
-  "etokspre",
  },
  ["omega"]={
-  "OmegaVersion",
-  "bodydir",
-  "chardp",
-  "charht",
-  "charit",
-  "charwd",
-  "leftghost",
-  "localbrokenpenalty",
-  "localinterlinepenalty",
-  "localleftbox",
-  "localrightbox",
-  "mathdir",
+  "Omegaminorversion",
+  "Omegarevision",
+  "Omegaversion",
   "odelcode",
   "odelimiter",
   "omathaccent",
@@ -388,23 +362,11 @@ return {
   "omathchardef",
   "omathcode",
   "oradical",
-  "pagedir",
-  "pageheight",
-  "pagewidth",
-  "pardir",
-  "rightghost",
-  "textdir",
  },
  ["pdftex"]={
-  "efcode",
-  "expanded",
-  "ifincsname",
   "ifpdfabsdim",
   "ifpdfabsnum",
   "ifpdfprimitive",
-  "leftmarginkern",
-  "letterspacefont",
-  "lpcode",
   "pdfadjustspacing",
   "pdfannot",
   "pdfcatalog",
@@ -417,8 +379,8 @@ return {
   "pdfdest",
   "pdfdestmargin",
   "pdfdraftmode",
-  "pdfeachlineheight",
   "pdfeachlinedepth",
+  "pdfeachlineheight",
   "pdfendlink",
   "pdfendthread",
   "pdffirstlineheight",
@@ -427,24 +389,22 @@ return {
   "pdffontname",
   "pdffontobjnum",
   "pdffontsize",
-  "pdfxformmargin",
   "pdfgamma",
   "pdfgentounicode",
   "pdfglyphtounicode",
   "pdfhorigin",
   "pdfignoreddimen",
+  "pdfignoreunknownimages",
+  "pdfimageaddfilename",
   "pdfimageapplygamma",
   "pdfimagegamma",
   "pdfimagehicolor",
   "pdfimageresolution",
   "pdfincludechars",
   "pdfinclusioncopyfonts",
-  "pdfignoreunknownimages",
   "pdfinclusionerrorlevel",
-  "pdfignoreunknownimages",
   "pdfinfo",
   "pdfinfoomitdate",
-  "pdftrailerid",
   "pdfinsertht",
   "pdflastannot",
   "pdflastlinedepth",
@@ -474,9 +434,9 @@ return {
   "pdfpageresources",
   "pdfpagesattr",
   "pdfpagewidth",
+  "pdfpkfixeddpi",
   "pdfpkmode",
   "pdfpkresolution",
-  "pdfpkfixeddpi",
   "pdfprimitive",
   "pdfprotrudechars",
   "pdfpxdimen",
@@ -493,39 +453,31 @@ return {
   "pdfsetrandomseed",
   "pdfstartlink",
   "pdfstartthread",
+  "pdfsuppressoptionalinfo",
+  "pdfsuppressptexinfo",
   "pdftexbanner",
   "pdftexrevision",
   "pdftexversion",
-  "pdfsuppressptexinfo",
-  "pdfsuppressoptionalinfo",
   "pdfthread",
   "pdfthreadmargin",
   "pdftracingfonts",
   "pdftrailer",
+  "pdftrailerid",
   "pdfuniformdeviate",
   "pdfuniqueresname",
   "pdfvorigin",
   "pdfxform",
   "pdfxformattr",
+  "pdfxformmargin",
   "pdfxformname",
   "pdfxformresources",
   "pdfximage",
-  "quitvmode",
-  "rightmarginkern",
-  "rpcode",
-  "tagcode",
  },
  ["tex"]={
+  " ",
   "-",
   "/",
-  "AlephVersion",
-  "Alephminorversion",
-  "Alephrevision",
-  "Alephversion",
-  "OmegaVersion",
-  "Omegaminorversion",
-  "Omegarevision",
-  "Omegaversion",
+  "Uchar",
   "Udelcode",
   "Udelcodenum",
   "Udelimiter",
@@ -534,7 +486,6 @@ return {
   "Uhextensible",
   "Uleft",
   "Umathaccent",
---"Umathaccents",
   "Umathaxis",
   "Umathbinbinspacing",
   "Umathbinclosespacing",
@@ -544,7 +495,6 @@ return {
   "Umathbinordspacing",
   "Umathbinpunctspacing",
   "Umathbinrelspacing",
---"Umathbotaccent",
   "Umathchar",
   "Umathcharclass",
   "Umathchardef",
@@ -562,7 +512,6 @@ return {
   "Umathcloserelspacing",
   "Umathcode",
   "Umathcodenum",
-  "Umathcodenumdef",
   "Umathconnectoroverlapmin",
   "Umathfractiondelsize",
   "Umathfractiondenomdown",
@@ -584,6 +533,8 @@ return {
   "Umathlimitbelowbgap",
   "Umathlimitbelowkern",
   "Umathlimitbelowvgap",
+  "Umathnolimitsubfactor",
+  "Umathnolimitsupfactor",
   "Umathopbinspacing",
   "Umathopclosespacing",
   "Umathopenbinspacing",
@@ -657,9 +608,9 @@ return {
   "Umathunderbarvgap",
   "Umathunderdelimiterbgap",
   "Umathunderdelimitervgap",
-  "Umathnolimitsupfactor",
-  "Umathnolimitsubfactor",
   "Umiddle",
+  "Unosubscript",
+  "Unosuperscript",
   "Uoverdelimiter",
   "Uradical",
   "Uright",
@@ -673,8 +624,6 @@ return {
   "Ustopmath",
   "Usubscript",
   "Usuperscript",
-  "Unosubscript",
-  "Unosuperscript",
   "Uunderdelimiter",
   "Uvextensible",
   "above",
@@ -683,6 +632,7 @@ return {
   "abovewithdelims",
   "accent",
   "adjdemerits",
+  "adjustspacing",
   "advance",
   "afterassignment",
   "aftergroup",
@@ -692,15 +642,13 @@ return {
   "atopwithdelims",
   "attribute",
   "attributedef",
-  "hyphenpenaltymode",
+  "automaticdiscretionary",
   "automatichyphenmode",
   "automatichyphenpenalty",
-  "automaticdiscretionary",
-  "explicithyphenpenalty",
-  "explicitdiscretionary",
   "badness",
   "baselineskip",
   "batchmode",
+  "begincsname",
   "begingroup",
   "belowdisplayshortskip",
   "belowdisplayskip",
@@ -717,10 +665,6 @@ return {
   "catcodetable",
   "char",
   "chardef",
---"chardp",
---"charht",
---"charit",
---"charwd",
   "cleaders",
   "clearmarks",
   "closein",
@@ -738,6 +682,7 @@ return {
   "crampedtextstyle",
   "crcr",
   "csname",
+  "csstring",
   "currentgrouplevel",
   "currentgrouptype",
   "currentifbranch",
@@ -767,6 +712,7 @@ return {
   "divide",
   "doublehyphendemerits",
   "dp",
+  "draftmode",
   "dump",
   "dviextension",
   "dvifeedback",
@@ -777,7 +723,6 @@ return {
   "eTeXversion",
   "edef",
   "efcode",
-  "hjcode",
   "else",
   "emergencystretch",
   "end",
@@ -791,6 +736,8 @@ return {
   "errorcontextlines",
   "errorstopmode",
   "escapechar",
+  "etoksapp",
+  "etokspre",
   "everycr",
   "everydisplay",
   "everyeof",
@@ -804,11 +751,14 @@ return {
   "expandafter",
   "expanded",
   "expandglyphsinfont",
+  "explicitdiscretionary",
+  "explicithyphenpenalty",
   "fam",
   "fi",
   "finalhyphendemerits",
   "firstmark",
   "firstmarks",
+  "firstvalidlanguage",
   "floatingpenalty",
   "font",
   "fontchardp",
@@ -816,7 +766,6 @@ return {
   "fontcharic",
   "fontcharwd",
   "fontdimen",
-  "firstvalidlanguage",
   "fontid",
   "fontname",
   "formatname",
@@ -840,18 +789,21 @@ return {
   "hfill",
   "hfilneg",
   "hfuzz",
+  "hjcode",
   "hoffset",
   "holdinginserts",
+  "hpack",
   "hrule",
   "hsize",
   "hskip",
   "hss",
   "ht",
   "hyphenation",
+  "hyphenationbounds",
+  "hyphenationmin",
   "hyphenchar",
   "hyphenpenalty",
-  "hyphenationmin",
-  "hyphenationbounds",
+  "hyphenpenaltymode",
   "if",
   "ifabsdim",
   "ifabsnum",
@@ -870,9 +822,6 @@ return {
   "ifmmode",
   "ifnum",
   "ifodd",
-  "ifpdfabsdim",
-  "ifpdfabsnum",
-  "ifpdfprimitive",
   "ifprimitive",
   "iftrue",
   "ifvbox",
@@ -887,6 +836,7 @@ return {
   "input",
   "inputlineno",
   "insert",
+  "insertht",
   "insertpenalties",
   "interactionmode",
   "interlinepenalties",
@@ -897,6 +847,7 @@ return {
   "lastbox",
   "lastkern",
   "lastlinefit",
+  "lastnamedcs",
   "lastnodetype",
   "lastpenalty",
   "lastsavedboxresourceindex",
@@ -932,6 +883,7 @@ return {
   "lowercase",
   "lpcode",
   "luaescapestring",
+  "luafunction",
   "luatexbanner",
   "luatexrevision",
   "luatexversion",
@@ -955,15 +907,16 @@ return {
   "mathopen",
   "mathoption",
   "mathord",
+  "mathpenaltiesmode",
   "mathpunct",
   "mathrel",
-  "mathrulesmode",
   "mathrulesfam",
+  "mathrulesmode",
   "mathscriptsmode",
   "mathstyle",
-  "mathsurroundskip",
-  "mathsurroundmode",
   "mathsurround",
+  "mathsurroundmode",
+  "mathsurroundskip",
   "maxdeadcycles",
   "maxdepth",
   "meaning",
@@ -984,36 +937,30 @@ return {
   "noalign",
   "noboundary",
   "noexpand",
+  "nohrule",
   "noindent",
   "nokerns",
-  "nohrule",
   "noligs",
-  "nospaces",
-  "novrule",
   "nolimits",
   "nolocaldirs",
   "nolocalwhatsits",
   "nonscript",
   "nonstopmode",
   "normaldeviate",
+  "nospaces",
+  "novrule",
   "nulldelimiterspace",
   "nullfont",
   "number",
   "numexpr",
-  "odelcode",
-  "odelimiter",
-  "omathaccent",
-  "omathchar",
-  "omathchardef",
-  "omathcode",
   "omit",
   "openin",
   "openout",
   "or",
-  "oradical",
   "outer",
   "output",
   "outputbox",
+  "outputmode",
   "outputpenalty",
   "over",
   "overfullrule",
@@ -1046,123 +993,21 @@ return {
   "parskip",
   "patterns",
   "pausing",
-  "pdfadjustspacing",
-  "pdfannot",
-  "pdfcatalog",
-  "pdfcolorstack",
-  "pdfcolorstackinit",
-  "pdfcompresslevel",
-  "pdfcopyfont",
-  "pdfcreationdate",
-  "pdfdecimaldigits",
-  "pdfdest",
-  "pdfdestmargin",
-  "pdfdraftmode",
-  "pdfeachlineheight",
-  "pdfeachlinedepth",
-  "pdfendlink",
-  "pdfendthread",
   "pdfextension",
+  "pdffeedback",
   "pdfvariable",
-  "pdffirstlineheight",
-  "pdffontattr",
-  "pdffontexpand",
-  "pdffontname",
-  "pdffontobjnum",
-  "pdffontsize",
-  "pdfxformmargin",
-  "pdfgamma",
-  "pdfgentounicode",
-  "pdfglyphtounicode",
-  "pdfhorigin",
-  "pdfignoreddimen",
-  "pdfimageaddfilename",
-  "pdfimageapplygamma",
-  "pdfimagegamma",
-  "pdfimagehicolor",
-  "pdfimageresolution",
-  "pdfincludechars",
-  "pdfinclusioncopyfonts",
-  "pdfinclusionerrorlevel",
-  "pdfignoreunknownimages",
-  "pdfinfo",
-  "pdfinfoomitdate",
-  "pdftrailerid",
-  "pdfinsertht",
-  "pdflastannot",
-  "pdflastlinedepth",
-  "pdflastlink",
-  "pdflastobj",
-  "pdflastxform",
-  "pdflastximage",
-  "pdflastximagepages",
-  "pdflastxpos",
-  "pdflastypos",
-  "pdflinkmargin",
-  "pdfliteral",
-  "pdfmapfile",
-  "pdfmapline",
-  "pdfminorversion",
-  "pdfnames",
-  "pdfnoligatures",
-  "pdfnormaldeviate",
-  "pdfobj",
-  "pdfobjcompresslevel",
-  "pdfoutline",
-  "pdfoutput",
-  "pdfpageattr",
-  "pdfpagebox",
-  "pdfpageheight",
-  "pdfpageref",
-  "pdfpageresources",
-  "pdfpagesattr",
-  "pdfpagewidth",
-  "pdfpkmode",
-  "pdfpkresolution",
-  "pdfpkfixeddpi",
-  "pdfprimitive",
-  "pdfprotrudechars",
-  "pdfpxdimen",
-  "pdfrandomseed",
-  "pdfrefobj",
-  "pdfrefxform",
-  "pdfrefximage",
-  "pdfreplacefont",
-  "pdfrestore",
-  "pdfretval",
-  "pdfsave",
-  "pdfsavepos",
-  "pdfsetmatrix",
-  "pdfsetrandomseed",
-  "pdfstartlink",
-  "pdfstartthread",
-  "pdftexbanner",
-  "pdftexrevision",
-  "pdftexversion",
-  "pdfsuppressptexinfo",
-  "pdfsuppressoptionalinfo",
-  "pdfthread",
-  "pdfthreadmargin",
-  "pdftracingfonts",
-  "pdftrailer",
-  "pdfuniformdeviate",
-  "pdfuniqueresname",
-  "pdfvorigin",
-  "pdfxform",
-  "pdfxformattr",
-  "pdfxformname",
-  "pdfxformresources",
-  "pdfximage",
   "penalty",
   "postdisplaypenalty",
   "postexhyphenchar",
   "posthyphenchar",
+  "prebinoppenalty",
   "predisplaydirection",
   "predisplaygapfactor",
   "predisplaypenalty",
   "predisplaysize",
   "preexhyphenchar",
   "prehyphenchar",
+  "prerelpenalty",
   "pretolerance",
   "prevdepth",
   "prevgraf",
@@ -1187,9 +1032,9 @@ return {
   "romannumeral",
   "rpcode",
   "saveboxresource",
+  "savecatcodetable",
   "saveimageresource",
   "savepos",
-  "savecatcodetable",
   "savinghyphcodes",
   "savingvdiscards",
   "scantextokens",
@@ -1204,8 +1049,8 @@ return {
   "setfontid",
   "setlanguage",
   "setrandomseed",
-  "shapemode",
   "sfcode",
+  "shapemode",
   "shipout",
   "show",
   "showbox",
@@ -1219,7 +1064,6 @@ return {
   "skewchar",
   "skip",
   "skipdef",
---"skipexpr",
   "spacefactor",
   "spaceskip",
   "span",
@@ -1235,8 +1079,8 @@ return {
   "suppressfontnotfounderror",
   "suppressifcsnameerror",
   "suppresslongerror",
-  "suppressoutererror",
   "suppressmathparerror",
+  "suppressoutererror",
   "synctex",
   "tabskip",
   "tagcode",
@@ -1248,11 +1092,14 @@ return {
   "thinmuskip",
   "time",
   "toks",
+  "toksapp",
   "toksdef",
+  "tokspre",
   "tolerance",
   "topmark",
   "topmarks",
   "topskip",
+  "tpack",
   "tracingassigns",
   "tracingcommands",
   "tracingfonts",
@@ -1294,6 +1141,7 @@ return {
   "vfilneg",
   "vfuzz",
   "voffset",
+  "vpack",
   "vrule",
   "vsize",
   "vskip",
@@ -1309,19 +1157,8 @@ return {
   "xleaders",
   "xspaceskip",
   "year",
-  --
-  "vpack",
-  "hpack",
-  "tpack",
-  "csstring",
-  "begincsname",
-  "lastnamedcs",
-  "toksapp",
-  "tokspre",
-  "etoksapp",
-  "etokspre",
  },
  ["xetex"]={
   "XeTeXversion",
  },
-}
+}
\ No newline at end of file