beta 2011.09.12 22:49

18 files changed, 894 insertions, 41 deletions

diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index adf0b75ed..7d16f193e 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -68165,6 +68165,8 @@ characters.data={
   category="so",
   cjkwd="a",
   description="BLACK SQUARE",
+  mathclass="ord",
+  mathname="blacksquare",
   direction="on",
   linebreak="ai",
   unicodeslot=0x25A0,
@@ -68194,7 +68196,6 @@ characters.data={
   direction="on",
   linebreak="al",
   mathclass="ord",
-  mathname="blacksquare",
   unicodeslot=0x25A2,
  },
  [0x25A3]={
@@ -186693,4 +186694,4 @@ characters.data={
   linebreak="cm",
   unicodeslot=0xE01EF,
  },
-}
\ No newline at end of file
+}
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index bf374e592..ba26b7226 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.09.10 12:55}
+\newcontextversion{2011.09.12 22:49}
 
 %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6a883f4c0..1c31ebf94 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.09.10 12:55}
+\newcontextversion{2011.09.12 22:49}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index 514586c2a..ef175af2a 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 8f5ad569d..1c047a3b6 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index ad97a7b07..a0ada15e9 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.09.10 12:55}
+\edef\contextversion{2011.09.12 22:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index a01cb24c4..88217fc54 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.09.10 12:55}
+\edef\contextversion{2011.09.12 22:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/lang-txt.lua b/tex/context/base/lang-txt.lua
index fc3a55170..f28cb18f1 100644
--- a/tex/context/base/lang-txt.lua
+++ b/tex/context/base/lang-txt.lua
@@ -312,7 +312,7 @@ data.labels={
     nb="",
     nl="en",
     nn="",
-    pl="",
+    pl="i",
     pt="",
     ro="",
     ru="",
@@ -422,7 +422,7 @@ data.labels={
     nb="april",
     nl="",
     nn="april",
-    pl="",
+    pl="kwi.",
     pt="",
     ro="",
     ru="",
@@ -456,7 +456,7 @@ data.labels={
     nb="på side ",
     nl="op pagina ",
     nn="på side ",
-    pl="",
+    pl="na stronie ",
     pt="",
     ro="",
     ru="на странице ",
@@ -529,7 +529,7 @@ data.labels={
     nb="aug.",
     nl="",
     nn="aug.",
-    pl="",
+    pl="sier.",
     pt="",
     ro="",
     ru="",
@@ -672,7 +672,7 @@ data.labels={
     nb="des.",
     nl="",
     nn="des.",
-    pl="",
+    pl="gru.",
     pt="",
     ro="",
     ru="",
@@ -744,7 +744,7 @@ data.labels={
     nb="feb.",
     nl="",
     nn="feb.",
-    pl="",
+    pl="lut.",
     pt="",
     ro="",
     ru="",
@@ -889,7 +889,7 @@ data.labels={
     nb="som vist over",
     nl="hierboven",
     nn="som vist over",
-    pl="",
+    pl="jak pokazano wyżej",
     pt="",
     ro="",
     ru="см. выше",
@@ -923,7 +923,7 @@ data.labels={
     nb="som vist under",
     nl="hieronder",
     nn="som vist under",
-    pl="",
+    pl="jak pokazano niżej",
     pt="",
     ro="",
     ru="см. ниже",
@@ -1032,7 +1032,7 @@ data.labels={
     nb="jan.",
     nl="",
     nn="jan.",
-    pl="",
+    pl="sty.",
     pt="",
     ro="",
     ru="",
@@ -1105,7 +1105,7 @@ data.labels={
     nb="juli",
     nl="",
     nn="juli",
-    pl="",
+    pl="lip.",
     pt="",
     ro="",
     ru="",
@@ -1177,7 +1177,7 @@ data.labels={
     nb="juni",
     nl="",
     nn="juni",
-    pl="",
+    pl="czerw.",
     pt="",
     ro="",
     ru="",
@@ -1322,7 +1322,7 @@ data.labels={
     nb="mars",
     nl="",
     nn="mars",
-    pl="",
+    pl="mar.",
     pt="",
     ro="",
     ru="",
@@ -1395,7 +1395,7 @@ data.labels={
     nb="mai",
     nl="",
     nn="mai",
-    pl="",
+    pl="maja",
     pt="",
     ro="",
     ru="",
@@ -1504,7 +1504,7 @@ data.labels={
     nb="nov.",
     nl="",
     nn="nov.",
-    pl="",
+    pl="lis.",
     pt="",
     ro="",
     ru="",
@@ -1575,7 +1575,7 @@ data.labels={
     nb="okt.",
     nl="",
     nn="okt.",
-    pl="",
+    pl="paź.",
     pt="",
     ro="",
     ru="",
@@ -1610,7 +1610,7 @@ data.labels={
     nb="side ",
     nl="pagina ",
     nn="side ",
-    pl="",
+    pl="strona ",
     pt="",
     ro="",
     ru="страница ",
@@ -1647,7 +1647,7 @@ data.labels={
     nb="Del",
     nl="Deel ",
     nn="Del",
-    pl="Ustęp ",
+    pl="Część ",	
     pt="Parte ",
     ro="Partea ",
     ru="Часть ",
@@ -1757,7 +1757,7 @@ data.labels={
     nb="se ",
     nl="zie ",
     nn="sjå ",
-    pl="",
+    pl="patrz ",
     pt="",
     ro="",
     ru="см. ",
@@ -1829,7 +1829,7 @@ data.labels={
     nb="sep.",
     nl="",
     nn="sep.",
-    pl="",
+    pl="wrz.",
     pt="",
     ro="",
     ru="",
@@ -1866,7 +1866,7 @@ data.labels={
     nb="",
     nl="",
     nn="",
-    pl="",
+    pl="Podpodrozdział ",
     pt="",
     ro="",
     ru="",
@@ -1940,7 +1940,7 @@ data.labels={
     nb="",
     nl="",
     nn="",
-    pl="",
+    pl="", -- not used in Polish
     pt="",
     ro="",
     ru="",
@@ -2164,7 +2164,7 @@ data.labels={
     nb="Forkortelser",
     nl="Afkortingen",
     nn="Forkortingar",
-    pl="Skrócenie",
+    pl="Wykaz skrótów",
     pt="Abreviaturas",
     ro="Abrevieri",
     ru="Список сокращений",
@@ -2275,7 +2275,7 @@ data.labels={
     nb="Bilde",
     nl="Grafieken",
     nn="Bilete",
-    pl="Grafika",
+    pl="Grafiki",
     pt="Gráficos",
     ro="Grafice",
     ru="Список графиков",
@@ -2419,7 +2419,7 @@ data.labels={
     nb="",
     nl="Literatuur",
     nn="",
-    pl="",
+    pl="Bibliografia",
     pt="",
     ro="",
     ru="",
diff --git a/tex/context/base/m-zint.mkiv b/tex/context/base/m-zint.mkiv
index c439476c2..95b265c57 100644
--- a/tex/context/base/m-zint.mkiv
+++ b/tex/context/base/m-zint.mkiv
@@ -47,6 +47,9 @@ local function numberofcode(code)
     if not reverse then
         local types = os.resultof(format("%s --types",zint)) or ""
         local formats = lpeg.match(pattern,types)
+        if not formats or not next(formats) then
+            return code
+        end
         reverse = table.swapped(formats) or { }
     end
     code = cleancode(code)
@@ -65,7 +68,8 @@ function moduledata.zint.generate(code,data,suffix,options)
         local code = numberofcode(code)
         logs.simple("using 'zint' to generate '%s'",base)
         io.savedata(temp,data)
-        os.execute(format('%s --barcode=%s --output="%s" --input="%s"',zint,code,name,temp,options or ""))
+        os.execute(format('%s --barcode=%s --output="%s" --input="%s" %s',zint,code,name,temp,options or ""))
+        os.remove(temp)
     end
     return name
 end
diff --git a/tex/context/base/math-map.lua b/tex/context/base/math-map.lua
index 3f3ef2a31..b21bbc027 100644
--- a/tex/context/base/math-map.lua
+++ b/tex/context/base/math-map.lua
@@ -23,9 +23,10 @@ local type, next = type, next
 local floor, div = math.floor, math.div
 local merged = table.merged
 
-local allocate = utilities.storage.allocate
-
-local texattribute = tex.attribute
+local allocate            = utilities.storage.allocate
+local texattribute        = tex.attribute
+local otffeatures         = fonts.constructors.newfeatures("otf")
+local registerotffeature  = otffeatures.register
 
 local trace_greek  = false  trackers.register("math.greek",  function(v) trace_greek = v end)
 
@@ -36,7 +37,9 @@ local mathematics = mathematics
 
 -- Unfortunately some alphabets have gaps (thereby troubling all applications that
 -- need to deal with math). Somewhat strange considering all those weird symbols that
--- were added afterwards.
+-- were added afterwards. The following trickery (and data) is only to be used for
+-- diagnostics and quick and dirty alphabet tracing (s-mat-10.mkiv) as we deal with
+-- it otherwise.
 
 mathematics.gaps = {
     [0x1D455] = 0x0210E, -- H
@@ -65,6 +68,28 @@ mathematics.gaps = {
     [0x1D551] = 0x02124, -- bb Z
 }
 
+local function fillinmathgaps(tfmdata,key,value)
+    local mathgaps     = mathematics.gaps
+    local characters   = tfmdata.characters
+    local descriptions = tfmdata.descriptions
+    for gap, original in next, mathgaps do
+        if characters[original] and not characters[gap] then
+            characters  [gap] = characters  [original]
+            descriptions[gap] = descriptions[original]
+        end
+    end
+end
+
+registerotffeature {
+    name         = "mathgaps",
+    description  = "plug gaps in math alphabets",
+    comment      = "regular document sources should not depend on this",
+    manipulators = {
+        base = fillinmathgaps,
+        node = fillinmathgaps,
+    }
+}
+
 -- we could use one level less and have tf etc be tables directly but the
 -- following approach permits easier remapping of a-a, A-Z and 0-9 to
 -- fallbacks; symbols is currently mostly greek
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index b01af31bb..9aa2f400a 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -1246,8 +1246,8 @@ mathencodings["tex-ma"] = {
     [0x025AA] = 0x05, -- squaresmallsolid      \centerdot
     [0x022C4] = 0x06, -- diamond               \Diamond \lozenge
     [0x02666] = 0x07, -- diamondsolid          \blacklozenge
-    [0x021BA] = 0x08, -- clockwise             \circlearrowright
-    [0x021BB] = 0x09, -- anticlockwise         \circlearrowleft
+    [0x021BB] = 0x08, -- clockwise             \circlearrowright
+    [0x021BA] = 0x09, -- anticlockwise         \circlearrowleft
     [0x021CC] = 0x0A, -- harpoonleftright      \rightleftharpoons
     [0x021CB] = 0x0B, -- harpoonrightleft      \leftrightharpoons
     [0x0229F] = 0x0C, -- squareminus           \boxminus
@@ -1464,8 +1464,8 @@ mathencodings["tex-mb"] = {
     [0x1D54F] = 0x58, -- X
     [0x1D550] = 0x59, -- Y
     [0x02124] = 0x5A, -- Z                     (blackboard Z)
-    [0x02132] = 0x60, -- hatwide               \Finv
-    [0x02141] = 0x61, -- hatwider              \Game
+    [0x02132] = 0x60, -- finv                  \Finv
+    [0x02141] = 0x61, -- fmir                  \Game
     --  [0x0] = 0x62,    tildewide
     --  [0x0] = 0x63,    tildewider
     --  [0x0] = 0x64,    Finv
diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mult-mps.lua
new file mode 100644
index 000000000..c56fe2eac
--- /dev/null
+++ b/tex/context/base/mult-mps.lua
@@ -0,0 +1,88 @@
+return {
+    primitives = { -- to be checked
+        "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", "true",
+        "and", "angle", "arclength", "arctime", "ASCII", "bluepart", "boolean", "bot",
+        "char", "color", "cosd", "cycle", "decimal", "directiontime", "floor", "fontsize",
+        "greenpart", "hex", "infont", "intersectiontimes", "known", "length", "llcorner",
+        "lrcorner", "makepath", "makepen", "mexp", "mlog", "normaldeviate", "not",
+        "numeric", "oct", "odd", "or", "path", "pair", "pen", "penoffset", "picture", "point",
+        "postcontrol", "precontrol", "redpart", "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",
+        "shipout", "show", "showdependencies", "showtoken", "showvariable",
+        "special",
+        "begingroup", "endgroup", "of", "curl", "tension", "and", "controls",
+        "reflectedabout", "rotatedaround", "interpath", "on", "off", "beginfig",
+        "endfig", "def", "vardef", "enddef", "epxr", "suffix", "text", "primary", "secondary",
+        "tertiary", "primarydef", "secondarydef", "tertiarydef", "top", "bottom",
+        "ulft", "urt", "llft", "lrt", "randomseed", "also", "contour", "doublepath",
+        "withcolor", "withpen", "dashed", "if", "else", "elseif", "fi", "for", "endfor", "forever", "exitif",
+        "forsuffixes", "downto", "upto", "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",
+    },
+    plain = {
+        "ahangle", "ahlength", "bboxmargin", "defaultpen", "defaultscale",
+        "labeloffset", "background", "currentpen", "currentpicture", "cuttings",
+        "defaultfont", "extra_beginfig", "extra_endfig",
+        "beveled", "black", "blue", "bp", "butt", "cc", "cm", "dd", "ditto", "down", "epsilon",
+        "evenly", "fullcircle", "green", "halfcircle", "identity", "in", "infinity", "left",
+        "mitered", "mm", "origin", "pensquare", "pt", "quartercircle", "red", "right",
+        "rounded", "squared", "unitsquare", "up", "white", "withdots",
+        "abs", "bbox", "ceiling", "center", "cutafter", "cutbefore", "dir",
+        "directionpoint", "div", "dotprod", "intersectionpoint", "inverse", "mod", "lft",
+        "round", "rt", "unitvector", "whatever",
+        "cutdraw", "draw", "drawarrow", "drawdblarrow", "fill", "filldraw", "drawdot",
+        "loggingall", "pickup", "tracingall", "tracingnone", "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",
+        "font_extra_space",
+    },
+    metafun = {
+        "unitcircle", "fulldiamond", "unitdiamond",
+        "halfcircle", "quartercircle",
+        "llcircle", "lrcircle", "urcircle", "ulcircle",
+        "tcircle", "bcircle", "lcircle", "rcircle",
+        "lltriangle", "lrtriangle", "urtriangle", "ultriangle",
+        "smoothed", "cornered", "superellipsed", "randomized", "squeezed",
+        "punked", "curved", "unspiked", "simplified", "blownup", "stretched",
+        "enlarged", "leftenlarged", "topenlarged", "rightenlarged", "bottomenlarged",
+        "llenlarged", "lrenlarged", "urenlarged", "ulenlarged",
+        "llmoved", "lrmoved", "urmoved", "ulmoved",
+        "boundingbox", "innerboundingbox", "outerboundingbox",
+        "bottomboundary", "leftboundary", "topboundary", "rightboundary",
+        "xsized", "ysized", "xysized",
+        "cmyk", "transparent", "withshade", "spotcolor",
+        "drawfill", "undrawfill",
+        "inverted", "uncolored", "softened", "grayed",
+        "textext", "graphictext",
+        "loadfigure", "externalfigure",
+    },
+}
diff --git a/tex/context/base/mult-prm.lua b/tex/context/base/mult-prm.lua
new file mode 100644
index 000000000..0c84563fc
--- /dev/null
+++ b/tex/context/base/mult-prm.lua
@@ -0,0 +1,717 @@
+return {
+ ["primitives"]={
+  "Alephminorversion",
+  "Alephversion",
+  "OmegaVersion",
+  "Omegaminorversion",
+  "Omegarevision",
+  "Udelcode",
+  "Udelcode",
+  "Udelcodenum",
+  "Udelimiter",
+  "Udelimiterover",
+  "Udelimiterunder",
+  "Umathaccent",
+  "Umathaccent",
+  "Umathaccents",
+  "Umathaccents",
+  "Umathaxis",
+  "Umathbinbinspacing",
+  "Umathbinbinspacing",
+  "Umathbinclosespacing",
+  "Umathbininnerspacing",
+  "Umathbinopenspacing",
+  "Umathbinopspacing",
+  "Umathbinopspacing",
+  "Umathbinordspacing",
+  "Umathbinordspacing",
+  "Umathbinpunctspacing",
+  "Umathbinpunctspacing",
+  "Umathbinrelspacing",
+  "Umathbotaccent",
+  "Umathbotaccent",
+  "Umathchar",
+  "Umathchardef",
+  "Umathchardef",
+  "Umathcharnum",
+  "Umathclosebinspacing",
+  "Umathclosebinspacing",
+  "Umathcloseclosespacing",
+  "Umathcloseclosespacing",
+  "Umathcloseinnerspacing",
+  "Umathcloseopenspacing",
+  "Umathcloseopenspacing",
+  "Umathcloseopspacing",
+  "Umathcloseordspacing",
+  "Umathclosepunctspacing",
+  "Umathcloserelspacing",
+  "Umathcode",
+  "Umathcode",
+  "Umathcodenum",
+  "Umathcodenum",
+  "Umathconnectoroverlapmin",
+  "Umathconnectoroverlapmin",
+  "Umathfractiondelsize",
+  "Umathfractiondenomdown",
+  "Umathfractiondenomdown",
+  "Umathfractiondenomvgap",
+  "Umathfractiondenomvgap",
+  "Umathfractionnumup",
+  "Umathfractionnumvgap",
+  "Umathfractionnumvgap",
+  "Umathfractionrule",
+  "Umathinnerbinspacing",
+  "Umathinnerbinspacing",
+  "Umathinnerclosespacing",
+  "Umathinnerclosespacing",
+  "Umathinnerinnerspacing",
+  "Umathinnerinnerspacing",
+  "Umathinneropenspacing",
+  "Umathinneropenspacing",
+  "Umathinneropspacing",
+  "Umathinneropspacing",
+  "Umathinnerordspacing",
+  "Umathinnerpunctspacing",
+  "Umathinnerrelspacing",
+  "Umathinnerrelspacing",
+  "Umathlimitabovebgap",
+  "Umathlimitabovekern",
+  "Umathlimitabovekern",
+  "Umathlimitabovevgap",
+  "Umathlimitabovevgap",
+  "Umathlimitbelowbgap",
+  "Umathlimitbelowkern",
+  "Umathlimitbelowvgap",
+  "Umathlimitbelowvgap",
+  "Umathopbinspacing",
+  "Umathopbinspacing",
+  "Umathopclosespacing",
+  "Umathopclosespacing",
+  "Umathopenbinspacing",
+  "Umathopenbinspacing",
+  "Umathopenclosespacing",
+  "Umathopenclosespacing",
+  "Umathopeninnerspacing",
+  "Umathopenopenspacing",
+  "Umathopenopspacing",
+  "Umathopenordspacing",
+  "Umathopenordspacing",
+  "Umathopenrelspacing",
+  "Umathoperatorsize",
+  "Umathoperatorsize",
+  "Umathopinnerspacing",
+  "Umathopinnerspacing",
+  "Umathopopenspacing",
+  "Umathopopenspacing",
+  "Umathopopspacing",
+  "Umathopordspacing",
+  "Umathoppunctspacing",
+  "Umathoppunctspacing",
+  "Umathoprelspacing",
+  "Umathoprelspacing",
+  "Umathordbinspacing",
+  "Umathordclosespacing",
+  "Umathordinnerspacing",
+  "Umathordopenspacing",
+  "Umathordopspacing",
+  "Umathordopspacing",
+  "Umathordordspacing",
+  "Umathordpunctspacing",
+  "Umathordrelspacing",
+  "Umathordrelspacing",
+  "Umathoverbarkern",
+  "Umathoverbarrule",
+  "Umathoverbarrule",
+  "Umathoverbarvgap",
+  "Umathoverdelimiterbgap",
+  "Umathoverdelimiterbgap",
+  "Umathoverdelimitervgap",
+  "Umathpunctbinspacing",
+  "Umathpunctbinspacing",
+  "Umathpunctclosespacing",
+  "Umathpunctinnerspacing",
+  "Umathpunctopenspacing",
+  "Umathpunctopenspacing",
+  "Umathpunctopspacing",
+  "Umathpunctopspacing",
+  "Umathpunctordspacing",
+  "Umathpunctordspacing",
+  "Umathpunctpunctspacing",
+  "Umathpunctrelspacing",
+  "Umathpunctrelspacing",
+  "Umathquad",
+  "Umathquad",
+  "Umathradicaldegreeafter",
+  "Umathradicaldegreeafter",
+  "Umathradicaldegreebefore",
+  "Umathradicaldegreeraise",
+  "Umathradicaldegreeraise",
+  "Umathradicalkern",
+  "Umathradicalkern",
+  "Umathradicalrule",
+  "Umathradicalrule",
+  "Umathradicalvgap",
+  "Umathradicalvgap",
+  "Umathrelbinspacing",
+  "Umathrelbinspacing",
+  "Umathrelclosespacing",
+  "Umathrelclosespacing",
+  "Umathrelinnerspacing",
+  "Umathrelinnerspacing",
+  "Umathrelopenspacing",
+  "Umathrelopenspacing",
+  "Umathrelopspacing",
+  "Umathrelopspacing",
+  "Umathrelpunctspacing",
+  "Umathrelrelspacing",
+  "Umathspaceafterscript",
+  "Umathspaceafterscript",
+  "Umathstackdenomdown",
+  "Umathstacknumup",
+  "Umathstacknumup",
+  "Umathstackvgap",
+  "Umathstackvgap",
+  "Umathsubshiftdown",
+  "Umathsubshiftdown",
+  "Umathsubshiftdrop",
+  "Umathsubshiftdrop",
+  "Umathsubsupshiftdown",
+  "Umathsubsupvgap",
+  "Umathsubsupvgap",
+  "Umathsubtopmax",
+  "Umathsubtopmax",
+  "Umathsupbottommin",
+  "Umathsupshiftdrop",
+  "Umathsupshiftup",
+  "Umathsupshiftup",
+  "Umathsupsubbottommax",
+  "Umathunderbarkern",
+  "Umathunderbarkern",
+  "Umathunderbarrule",
+  "Umathunderbarrule",
+  "Umathunderbarvgap",
+  "Umathunderbarvgap",
+  "Umathunderdelimiterbgap",
+  "Umathunderdelimiterbgap",
+  "Umathunderdelimitervgap",
+  "Umathunderdelimitervgap",
+  "Uoverdelimiter",
+  "Uradical",
+  "Uradical",
+  "Uroot",
+  "Uroot",
+  "Ustack",
+  "Ustack",
+  "Ustartdisplaymath",
+  "Ustartmath",
+  "Ustartmath",
+  "Ustopdisplaymath",
+  "Ustopmath",
+  "Usubscript",
+  "Usubscript",
+  "Usuperscript",
+  "Usuperscript",
+  "Uunderdelimiter",
+  "Uunderdelimiter",
+  "abovedisplayshortskip",
+  "abovedisplayskip",
+  "abovewithdelims",
+  "accent",
+  "adjdemerits",
+  "advance",
+  "afterassignment",
+  "aftergroup",
+  "alignmark",
+  "aligntab",
+  "aligntab",
+  "atop",
+  "atopwithdelims",
+  "attribute",
+  "attribute",
+  "attributedef",
+  "attributedef",
+  "badness",
+  "baselineskip",
+  "batchmode",
+  "bodydir",
+  "botmark",
+  "botmarks",
+  "box",
+  "boxdir",
+  "boxmaxdepth",
+  "brokenpenalty",
+  "catcodetable",
+  "catcodetable",
+  "char",
+  "chardp",
+  "chardp",
+  "charht",
+  "charit",
+  "charit",
+  "charwd",
+  "charwd",
+  "cleaders",
+  "clearmarks",
+  "closein",
+  "closeout",
+  "clubpenalties",
+  "clubpenalty",
+  "count",
+  "countdef",
+  "cr",
+  "crampeddisplaystyle",
+  "crampeddisplaystyle",
+  "crampedscriptscriptstyle",
+  "crampedscriptstyle",
+  "crampedtextstyle",
+  "crampedtextstyle",
+  "crcr",
+  "csname",
+  "currentgrouplevel",
+  "currentgrouptype",
+  "currentifbranch",
+  "currentiflevel",
+  "day",
+  "deadcycles",
+  "defaultskewchar",
+  "delcode",
+  "delimiterfactor",
+  "delimitershortfall",
+  "detokenize",
+  "dimen",
+  "dimendef",
+  "dimexpr",
+  "directlua",
+  "discretionary",
+  "displaylimits",
+  "displaystyle",
+  "displaywidowpenalty",
+  "doublehyphendemerits",
+  "dp",
+  "eTeXVersion",
+  "eTeXminorversion",
+  "eTeXrevision",
+  "eTeXversion",
+  "edef",
+  "efcode",
+  "else",
+  "emergencystretch",
+  "endcsname",
+  "endgroup",
+  "endinput",
+  "endlinechar",
+  "eqno",
+  "errmessage",
+  "errorcontextlines",
+  "errorstopmode",
+  "escapechar",
+  "everyeof",
+  "everyjob",
+  "everymath",
+  "everyvbox",
+  "exhyphenchar",
+  "exhyphenpenalty",
+  "expandafter",
+  "fi",
+  "firstmarks",
+  "floatingpenalty",
+  "font",
+  "fontcharic",
+  "fontcharwd",
+  "fontid",
+  "fontid",
+  "fontname",
+  "formatname",
+  "gdef",
+  "gleaders",
+  "global",
+  "globaldefs",
+  "glueshrink",
+  "glueshrinkorder",
+  "gluestretch",
+  "gluestretchorder",
+  "gluetomu",
+  "halign",
+  "hangafter",
+  "hangindent",
+  "hbadness",
+  "hbox",
+  "hfil",
+  "hfill",
+  "hfilneg",
+  "holdinginserts",
+  "hrule",
+  "hsize",
+  "hskip",
+  "hss",
+  "ht",
+  "hyphenchar",
+  "hyphenpenalty",
+  "if",
+  "ifabsdim",
+  "ifabsdim",
+  "ifabsnum",
+  "ifabsnum",
+  "ifcase",
+  "ifcat",
+  "ifcsname",
+  "ifdefined",
+  "ifeof",
+  "ifhbox",
+  "ifhmode",
+  "ifincsname",
+  "ifmmode",
+  "ifnum",
+  "ifodd",
+  "ifpdfabsdim",
+  "ifpdfprimitive",
+  "ifprimitive",
+  "ifprimitive",
+  "iftrue",
+  "ifvbox",
+  "ifvmode",
+  "ifvoid",
+  "ifx",
+  "ignorespaces",
+  "immediate",
+  "indent",
+  "initcatcodetable",
+  "initcatcodetable",
+  "input",
+  "insert",
+  "insertpenalties",
+  "interactionmode",
+  "interlinepenalty",
+  "language",
+  "lastbox",
+  "lastkern",
+  "lastlinefit",
+  "lastnodetype",
+  "lastpenalty",
+  "latelua",
+  "latelua",
+  "lccode",
+  "leaders",
+  "leftghost",
+  "leftghost",
+  "lefthyphenmin",
+  "leftmarginkern",
+  "leftskip",
+  "leqno",
+  "let",
+  "letterspacefont",
+  "linepenalty",
+  "lineskip",
+  "lineskiplimit",
+  "localbrokenpenalty",
+  "localbrokenpenalty",
+  "localinterlinepenalty",
+  "localinterlinepenalty",
+  "localleftbox",
+  "localrightbox",
+  "localrightbox",
+  "long",
+  "lowercase",
+  "lpcode",
+  "luaescapestring",
+  "luatexdatestamp",
+  "luatexrevision",
+  "luatexrevision",
+  "luatexversion",
+  "mark",
+  "marks",
+  "mathaccent",
+  "mathbin",
+  "mathchar",
+  "mathchardef",
+  "mathchoice",
+  "mathcode",
+  "mathdir",
+  "mathinner",
+  "mathop",
+  "mathopen",
+  "mathord",
+  "mathstyle",
+  "mathsurround",
+  "maxdeadcycles",
+  "maxdepth",
+  "meaning",
+  "message",
+  "middle",
+  "month",
+  "moveleft",
+  "moveright",
+  "muexpr",
+  "muskip",
+  "muskipdef",
+  "mutoglue",
+  "newlinechar",
+  "noalign",
+  "noexpand",
+  "noindent",
+  "nokerns",
+  "nokerns",
+  "noligs",
+  "noligs",
+  "nolimits",
+  "nolocaldirs",
+  "nolocalwhatsits",
+  "nonscript",
+  "nullfont",
+  "number",
+  "odelcode",
+  "odelcode",
+  "odelimiter",
+  "odelimiter",
+  "omathaccent",
+  "omathaccent",
+  "omathchar",
+  "omathchar",
+  "omathchardef",
+  "omathchardef",
+  "omathcode",
+  "omathcode",
+  "omit",
+  "openin",
+  "openout",
+  "or",
+  "oradical",
+  "oradical",
+  "outer",
+  "output",
+  "outputbox",
+  "outputbox",
+  "outputpenalty",
+  "over",
+  "overfullrule",
+  "overline",
+  "overwithdelims",
+  "pagebottomoffset",
+  "pagedepth",
+  "pagedir",
+  "pagediscards",
+  "pagefilllstretch",
+  "pagefillstretch",
+  "pagefilstretch",
+  "pagegoal",
+  "pageheight",
+  "pageheight",
+  "pageleftoffset",
+  "pageleftoffset",
+  "pageshrink",
+  "pagestretch",
+  "pagetopoffset",
+  "pagetopoffset",
+  "pagetotal",
+  "pagewidth",
+  "pagewidth",
+  "par",
+  "pardir",
+  "pardir",
+  "parfillskip",
+  "parshapedimen",
+  "parshapeindent",
+  "parshapelength",
+  "parskip",
+  "patterns",
+  "pausing",
+  "pdfadjustspacing",
+  "pdfcatalog",
+  "pdfcolorstack",
+  "pdfcolorstackinit",
+  "pdfcompresslevel",
+  "pdfdecimaldigits",
+  "pdfdest",
+  "pdfdestmargin",
+  "pdfdraftmode",
+  "pdfeachlinedepth",
+  "pdfeachlineheight",
+  "pdfendthread",
+  "pdffirstlineheight",
+  "pdffontexpand",
+  "pdffontobjnum",
+  "pdffontsize",
+  "pdfgamma",
+  "pdfgentounicode",
+  "pdfglyphtounicode",
+  "pdfhorigin",
+  "pdfignoreddimen",
+  "pdfimagehicolor",
+  "pdfimageresolution",
+  "pdfinclusioncopyfonts",
+  "pdfinclusionerrorlevel",
+  "pdfinfo",
+  "pdfinsertht",
+  "pdflastannot",
+  "pdflastlinedepth",
+  "pdflastlink",
+  "pdflastobj",
+  "pdflastxform",
+  "pdflastxpos",
+  "pdflastypos",
+  "pdflinkmargin",
+  "pdfmapline",
+  "pdfminorversion",
+  "pdfnormaldeviate",
+  "pdfobj",
+  "pdfoptionpdfminorversion",
+  "pdfoutput",
+  "pdfpagebox",
+  "pdfpageheight",
+  "pdfpageref",
+  "pdfpagesattr",
+  "pdfpagewidth",
+  "pdfpkmode",
+  "pdfpkresolution",
+  "pdfprimitive",
+  "pdfprotrudechars",
+  "pdfrandomseed",
+  "pdfrefobj",
+  "pdfrefxform",
+  "pdfrefximage",
+  "pdfreplacefont",
+  "pdfrestore",
+  "pdfretval",
+  "pdfsave",
+  "pdfsavepos",
+  "pdfsetrandomseed",
+  "pdfstartthread",
+  "pdftexbanner",
+  "pdftexrevision",
+  "pdftexversion",
+  "pdftracingfonts",
+  "pdftrailer",
+  "pdfuniqueresname",
+  "pdfvorigin",
+  "pdfxform",
+  "pdfxformattr",
+  "pdfxformname",
+  "pdfxformresources",
+  "pdfximage",
+  "pdfximagebbox",
+  "penalty",
+  "postdisplaypenalty",
+  "postexhyphenchar",
+  "posthyphenchar",
+  "posthyphenchar",
+  "predisplaydirection",
+  "predisplaysize",
+  "preexhyphenchar",
+  "preexhyphenchar",
+  "prehyphenchar",
+  "prehyphenchar",
+  "pretolerance",
+  "prevdepth",
+  "prevgraf",
+  "primitive",
+  "primitive",
+  "protected",
+  "quitvmode",
+  "raise",
+  "read",
+  "readline",
+  "relax",
+  "relpenalty",
+  "right",
+  "rightghost",
+  "rightmarginkern",
+  "rightskip",
+  "rpcode",
+  "savecatcodetable",
+  "savecatcodetable",
+  "savinghyphcodes",
+  "scantextokens",
+  "scriptfont",
+  "scriptscriptfont",
+  "scriptscriptstyle",
+  "scriptspace",
+  "scriptstyle",
+  "scrollmode",
+  "setbox",
+  "setlanguage",
+  "sfcode",
+  "shipout",
+  "showbox",
+  "showboxbreadth",
+  "showgroups",
+  "showifs",
+  "showlists",
+  "showthe",
+  "showtokens",
+  "skewchar",
+  "skip",
+  "spacefactor",
+  "spaceskip",
+  "span",
+  "special",
+  "splitbotmark",
+  "splitdiscards",
+  "splitfirstmark",
+  "splitmaxdepth",
+  "splittopskip",
+  "string",
+  "suppressfontnotfounderror",
+  "suppressfontnotfounderror",
+  "suppressifcsnameerror",
+  "suppressifcsnameerror",
+  "suppresslongerror",
+  "suppressoutererror",
+  "suppressoutererror",
+  "synctex",
+  "tabskip",
+  "tagcode",
+  "textdir",
+  "textfont",
+  "the",
+  "thickmuskip",
+  "time",
+  "toks",
+  "toksdef",
+  "tolerance",
+  "topmarks",
+  "topskip",
+  "tracingassigns",
+  "tracingcommands",
+  "tracinggroups",
+  "tracingifs",
+  "tracinglostchars",
+  "tracingmacros",
+  "tracingnesting",
+  "tracingonline",
+  "tracingoutput",
+  "tracingpages",
+  "tracingparagraphs",
+  "tracingrestores",
+  "tracingstats",
+  "uccode",
+  "uchyph",
+  "unexpanded",
+  "unhbox",
+  "unhcopy",
+  "unkern",
+  "unless",
+  "unskip",
+  "unvbox",
+  "unvcopy",
+  "uppercase",
+  "valign",
+  "vbadness",
+  "vbox",
+  "vcenter",
+  "vfil",
+  "vfill",
+  "vfilneg",
+  "vfuzz",
+  "vrule",
+  "vsize",
+  "vss",
+  "vtop",
+  "wd",
+  "widowpenalties",
+  "widowpenalty",
+  "xdef",
+  "xleaders",
+  "xspaceskip",
+  "year",
+ },
+}
\ No newline at end of file
diff --git a/tex/context/base/mult-prm.mkiv b/tex/context/base/mult-prm.mkiv
new file mode 100644
index 000000000..4fda18463
--- /dev/null
+++ b/tex/context/base/mult-prm.mkiv
@@ -0,0 +1,18 @@
+\starttext
+
+\startluacode
+    local primitives = { }
+    table.merge(primitives,table.fromhash(tex.primitives()))
+    table.merge(primitives,tex.extraprimitives('etex'))
+    table.merge(primitives,tex.extraprimitives('pdftex'))
+    table.merge(primitives,tex.extraprimitives('luatex'))
+    table.merge(primitives,tex.extraprimitives('aleph'))
+    table.merge(primitives,tex.extraprimitives('omega'))
+    table.sort(primitives)
+    while string.find(primitives[1],"[^A-Za-z]") do
+        table.remove(primitives,1)
+    end
+    io.savedata("mult-prm.lua",table.serialize({ primitives = primitives },true,{ reduce = true, inline = false }))
+\stopluacode
+
+\stoptext
diff --git a/tex/context/base/scrn-fld.mkvi b/tex/context/base/scrn-fld.mkvi
index 4a8ece692..02cf5afca 100644
--- a/tex/context/base/scrn-fld.mkvi
+++ b/tex/context/base/scrn-fld.mkvi
@@ -751,7 +751,7 @@
 \def\scrn_fieldstack_add#tag#settings#symbol%
   {\advance\scratchcounter\plusone
    \edef\currentfieldstackname{#tag:\number\scratchcounter}%
-   \ifnum\scratchcounter=\ifnum\scratchcounter=\fieldcategoryparameter\c!start\relax
+   \ifnum\scratchcounter=\fieldcategoryparameter\c!start\relax
      \definefieldbody[\currentfieldstackname][\c!type=check,\c!values={#symbol,\empty},\c!default={#symbol}]%
    \else
      \definefieldbody[\currentfieldstackname][\c!type=check,\c!values={#symbol,\empty},\c!default=]%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 47cd9f065..1e72db3fc 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 7c0fee211..48e8df334 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 0b7d332cd..48733addb 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 09/10/11 12:55:30
+-- merge date  : 09/12/11 22:49:51
 
 do -- begin closure to overcome local limits and interference