2022-12-01 12:41:00

12 files changed, 162 insertions, 65 deletions

diff --git a/tex/context/base/mkiv/char-def.lua b/tex/context/base/mkiv/char-def.lua
index a5a21687b..276d0f700 100644
--- a/tex/context/base/mkiv/char-def.lua
+++ b/tex/context/base/mkiv/char-def.lua
@@ -1467,6 +1467,7 @@ characters.data={
   description="TILDE",
   direction="on",
   linebreak="al",
+  mathclass="relation",
   synonyms={ "spacing tilde" },
   unicodeslot=0x7E,
  },
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index db7e8f9a2..820a372bb 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{2022.11.18 13:15}
+\newcontextversion{2022.12.01 12:38}
 
 %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 107874ffd..d7a655b4f 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -49,7 +49,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2022.11.18 13:15}
+\edef\contextversion{2022.12.01 12:38}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/font-cff.lua b/tex/context/base/mkiv/font-cff.lua
index 4b60cd6c0..f1c377637 100644
--- a/tex/context/base/mkiv/font-cff.lua
+++ b/tex/context/base/mkiv/font-cff.lua
@@ -2061,24 +2061,26 @@ end
                         if t == 8 and top > 48 then
                             -- let's assume this only happens for rrcurveto .. the other ones would need some more
                             -- complex handling (cff2 stuff)
+                            --
+                            -- dx1 dy1 (dx1+dx2) (dy1+dy2) (dx1+dx2+dx3) (dy1+dy2+dy3) rcurveto.
                             local n = 0
                             for i=1,top do
                              -- if n == 42 then
                                 if n == 48 then
-                                    local zero = encode[0]
-                                    local res3 = result[r-3]
-                                    local res2 = result[r-2]
-                                    local res1 = result[r-1]
-                                    local res0 = result[r]
-                                    result[r-3] = zero
-                                    result[r-2] = zero
+--                                     local zero = encode[0]
+--                                     local res3 = result[r-3]
+--                                     local res2 = result[r-2]
+--                                     local res1 = result[r-1]
+--                                     local res0 = result[r]
+--                                     result[r-3] = zero
+--                                     result[r-2] = zero
                                     r = r + 1 ; result[r] = chars[t]
-                                    r = r + 1 ; result[r] = zero
-                                    r = r + 1 ; result[r] = zero
-                                    r = r + 1 ; result[r] = res3
-                                    r = r + 1 ; result[r] = res2
-                                    r = r + 1 ; result[r] = res1
-                                    r = r + 1 ; result[r] = res0
+--                                     r = r + 1 ; result[r] = zero
+--                                     r = r + 1 ; result[r] = zero
+--                                     r = r + 1 ; result[r] = res3
+--                                     r = r + 1 ; result[r] = res2
+--                                     r = r + 1 ; result[r] = res1
+--                                     r = r + 1 ; result[r] = res0
                                     n = 1
                                 else
                                     n = n + 1
diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index f5e12c0ef..80e623929 100644
--- a/tex/context/base/mkiv/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
@@ -3089,9 +3089,11 @@ function readers.colr(f,fontdata,specification)
     local tableoffset = gotodatatable(f,fontdata,"colr",specification.glyphs)
     if tableoffset then
         local version = readushort(f)
-        if version ~= 0 then
+        if version == 0 or version == 1 then
             report("table version %a of %a is not supported (yet), maybe font %s is bad",version,"colr",fontdata.filename)
             return
+        else
+            -- both versions have this in common
         end
         if not fontdata.tables.cpal then
             report("color table %a in font %a has no mandate %a table","colr",fontdata.filename,"cpal")
diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua
index 339de109f..0b4bb65bb 100644
--- a/tex/context/base/mkiv/font-otr.lua
+++ b/tex/context/base/mkiv/font-otr.lua
@@ -66,6 +66,7 @@ if not modules then modules = { } end modules ['font-otr'] = {
 --     require("char-ini")
 -- end
 
+local number = number
 local next, type, tonumber, rawget = next, type, tonumber, rawget
 local byte, lower, char, gsub = string.byte, string.lower, string.char, string.gsub
 local fullstrip = string.fullstrip
@@ -1683,7 +1684,7 @@ end
 function readers.cmap(f,fontdata,specification)
     local tableoffset = gotodatatable(f,fontdata,"cmap",specification.glyphs)
     if tableoffset then
-        local version      = readushort(f)
+        local version      = readushort(f) -- check later versions
         local noftables    = readushort(f)
         local records      = { }
         local unicodecid   = false
@@ -2425,25 +2426,29 @@ function readers.loadfont(filename,n,instance)
                 nofsubfonts   = fontdata.subfonts and #fontdata.subfonts or nil,
             },
             resources     = {
-             -- filename      = fontdata.filename,
-                filename      = filename,
-                private       = privateoffset,
-                duplicates    = fontdata.duplicates  or { },
-                features      = fontdata.features    or { }, -- we need to add these in the loader
-                sublookups    = fontdata.sublookups  or { }, -- we need to add these in the loader
-                marks         = fontdata.marks       or { }, -- we need to add these in the loader
-                markclasses   = fontdata.markclasses or { }, -- we need to add these in the loader
-                marksets      = fontdata.marksets    or { }, -- we need to add these in the loader
-                sequences     = fontdata.sequences   or { }, -- we need to add these in the loader
-                variants      = fontdata.variants, -- variant -> unicode -> glyph
-                version       = getname(fontdata,"version"),
-                cidinfo       = fontdata.cidinfo,
-                mathconstants = fontdata.mathconstants,
-                colorpalettes = fontdata.colorpalettes,
-                svgshapes     = fontdata.svgshapes,
-                pngshapes     = fontdata.pngshapes,
-                variabledata  = fontdata.variabledata,
-                foundtables   = fontdata.foundtables,
+             -- filename        = fontdata.filename,
+                filename        = filename,
+                private         = privateoffset,
+                duplicates      = fontdata.duplicates  or { },
+                features        = fontdata.features    or { }, -- we need to add these in the loader
+                sublookups      = fontdata.sublookups  or { }, -- we need to add these in the loader
+                marks           = fontdata.marks       or { }, -- we need to add these in the loader
+                markclasses     = fontdata.markclasses or { }, -- we need to add these in the loader
+                marksets        = fontdata.marksets    or { }, -- we need to add these in the loader
+                sequences       = fontdata.sequences   or { }, -- we need to add these in the loader
+                variants        = fontdata.variants, -- variant -> unicode -> glyph
+                version         = getname(fontdata,"version"),
+                cidinfo         = fontdata.cidinfo,
+                mathconstants   = fontdata.mathconstants,
+                colorpalettes   = fontdata.colorpalettes,
+                colorpaintdata  = fontdata.colorpaintdata,
+                colorpaintlist  = fontdata.colorpaintlist,
+                colorlinesdata  = fontdata.colorlinesdata,
+                coloraffinedata = fontdata.coloraffinedata,
+                svgshapes       = fontdata.svgshapes,
+                pngshapes       = fontdata.pngshapes,
+                variabledata    = fontdata.variabledata,
+                foundtables     = fontdata.foundtables,
             },
         }
     end
diff --git a/tex/context/base/mkiv/font-ott.lua b/tex/context/base/mkiv/font-ott.lua
index aa1defd6a..74fd58375 100644
--- a/tex/context/base/mkiv/font-ott.lua
+++ b/tex/context/base/mkiv/font-ott.lua
@@ -52,16 +52,20 @@ local scripts = allocate {
     ["cari"] = "carian",
     ["cham"] = "cham",
     ["cher"] = "cherokee",
+    ["chrs"] = "chorasmian",
     ["copt"] = "coptic",
+    ["cpmn"] = "cypro-minoan",
     ["cprt"] = "cypriot syllabary",
     ["cyrl"] = "cyrillic",
     ["dev2"] = "devanagari variant 2",
     ["deva"] = "devanagari",
+    ["diak"] = "dives akuru",
     ["dogr"] = "dogra",
     ["dsrt"] = "deseret",
     ["dupl"] = "duployan",
     ["egyp"] = "egyptian heiroglyphs",
     ["elba"] = "elbasan",
+    ["elym"] = "elymaic",
     ["ethi"] = "ethiopic",
     ["geor"] = "georgian",
     ["gjr2"] = "gujarati variant 2",
@@ -81,6 +85,7 @@ local scripts = allocate {
     ["hebr"] = "hebrew",
     ["hluw"] = "anatolian hieroglyphs",
     ["hmng"] = "pahawh hmong",
+    ["hmnp"] = "nyiakeng puachue hmong",
     ["hung"] = "old hungarian",
     ["ital"] = "old italic",
     ["jamo"] = "hangul jamo",
@@ -90,6 +95,7 @@ local scripts = allocate {
     ["khar"] = "kharosthi",
     ["khmr"] = "khmer",
     ["khoj"] = "khojki",
+    ["kits"] = "khitan small script",
     ["knd2"] = "kannada variant 2",
     ["knda"] = "kannada",
     ["kthi"] = "kaithi",
@@ -123,6 +129,7 @@ local scripts = allocate {
     ["musc"] = "musical symbols",
     ["mym2"] = "myanmar variant 2",
     ["mymr"] = "myanmar",
+    ["nand"] = "nandinagari",
     ["narb"] = "old north arabian",
     ["nbat"] = "nabataean",
     ["newa"] = "newa",
@@ -132,9 +139,10 @@ local scripts = allocate {
     ["olck"] = "ol chiki",
     ["orkh"] = "old turkic and orkhon runic",
     ["ory2"] = "odia variant 2",
-    ["orya"] = "oriya",
+    ["orya"] = "odia",
     ["osge"] = "osage",
     ["osma"] = "osmanya",
+    ["ougr"] = "old uyghur",
     ["palm"] = "palmyrene",
     ["pauc"] = "pau cin hau",
     ["perm"] = "old permic",
@@ -166,7 +174,7 @@ local scripts = allocate {
     ["tagb"] = "tagbanwa",
     ["takr"] = "takri",
     ["tale"] = "tai le",
-    ["talu"] = "tai lu",
+    ["talu"] = "new tai lue",
     ["taml"] = "tamil",
     ["tang"] = "tangut",
     ["tavt"] = "tai viet",
@@ -178,12 +186,16 @@ local scripts = allocate {
     ["thai"] = "thai",
     ["tibt"] = "tibetan",
     ["tirh"] = "tirhuta",
+    ["tnsa"] = "tangsa",
     ["tml2"] = "tamil variant 2",
+    ["toto"] = "toto",
     ["ugar"] = "ugaritic cuneiform",
     ["vai" ] = "vai",
     ["wara"] = "warang citi",
+    ["wcho"] = "wancho",
     ["xpeo"] = "old persian cuneiform",
     ["xsux"] = "sumero-akkadian cuneiform",
+    ["yezi"] = "yezidi",
     ["yi"  ] = "yi",
     ["zanb"] = "zanabazar square",
 }
@@ -199,6 +211,7 @@ local languages = allocate {
     ["agw" ] = "agaw",
     ["aio" ] = "aiton",
     ["aka" ] = "akan",
+    ["akb" ] = "batak angkola",
     ["als" ] = "alsatian",
     ["alt" ] = "altai",
     ["amh" ] = "amharic",
@@ -211,6 +224,7 @@ local languages = allocate {
     ["asm" ] = "assamese",
     ["ast" ] = "asturian",
     ["ath" ] = "athapaskan",
+    ["avn" ] = "avatime",
     ["avr" ] = "avar",
     ["awa" ] = "awadhi",
     ["aym" ] = "aymara",
@@ -256,8 +270,12 @@ local languages = allocate {
     ["brx" ] = "bodo",
     ["bsh" ] = "bashkir",
     ["bsk" ] = "burushaski",
+    ["bta" ] = "batak alas kluet",
+    ["btd" ] = "batak dairi (pakpak)",
     ["bti" ] = "beti",
+    ["btm" ] = "batak mandailing",
     ["bts" ] = "batak simalungun",
+    ["btx" ] = "batak karo",
     ["bug" ] = "bugis",
     ["byv" ] = "medumba",
     ["cak" ] = "kaqchikel",
@@ -292,14 +310,16 @@ local languages = allocate {
     ["csl" ] = "church slavonic",
     ["csy" ] = "czech",
     ["ctg" ] = "chittagonian",
+    ["ctt" ] = "wayanad chetti",
     ["cuk" ] = "san blas kuna",
+    ["dag" ] = "dagbani",
     ["dan" ] = "danish",
     ["dar" ] = "dargwa",
     ["dax" ] = "dayi",
     ["dcr" ] = "woods cree",
     ["deu" ] = "german",
-    ["dgo" ] = "dogri",
-    ["dgr" ] = "dogri",
+    ["dgo" ] = "dogri (individual language)",
+    ["dgr" ] = "dogri (macro language)",
     ["dhg" ] = "dhangu",
     ["dhv" ] = "divehi (dhivehi, maldivian)",
     ["diq" ] = "dimli",
@@ -371,13 +391,16 @@ local languages = allocate {
     ["guj" ] = "gujarati",
     ["guz" ] = "gusii",
     ["hai" ] = "haitian (haitian creole)",
+    ["hai0"] = "haida",
     ["hal" ] = "halam",
     ["har" ] = "harauti",
     ["hau" ] = "hausa",
     ["haw" ] = "hawaiian",
     ["hay" ] = "haya",
     ["haz" ] = "hazaragi",
+    ["hmz" ] = "hmong shuat",
     ["hbn" ] = "hammer-banna",
+    ["hei" ] = "heiltsuk",
     ["her" ] = "herero",
     ["hil" ] = "hiligaynon",
     ["hin" ] = "hindi",
@@ -402,10 +425,12 @@ local languages = allocate {
     ["ind" ] = "indonesian",
     ["ing" ] = "ingush",
     ["inu" ] = "inuktitut",
+    ["inuk"] = "nunavik inuktitut",
     ["ipk" ] = "inupiat",
     ["ipph"] = "phonetic transcription—ipa conventions",
     ["iri" ] = "irish",
     ["irt" ] = "irish traditional",
+    ["uri" ] = "irula",
     ["isl" ] = "icelandic",
     ["ism" ] = "inari sami",
     ["ita" ] = "italian",
@@ -425,6 +450,7 @@ local languages = allocate {
     ["kan" ] = "kannada",
     ["kar" ] = "karachay",
     ["kat" ] = "georgian",
+    ["kaw" ] = "kawi (old javanese)",
     ["kaz" ] = "kazakh",
     ["kde" ] = "makonde",
     ["kea" ] = "kabuverdianu (crioulo)",
@@ -482,6 +508,7 @@ local languages = allocate {
     ["kur" ] = "kurdish",
     ["kuu" ] = "kurukh",
     ["kuy" ] = "kuy",
+    ["kwk" ] = "kwakʼwala",
     ["kyk" ] = "koryak",
     ["kyu" ] = "western kayah",
     ["lad" ] = "ladin",
@@ -493,6 +520,7 @@ local languages = allocate {
     ["laz" ] = "laz",
     ["lcr" ] = "l-cree",
     ["ldk" ] = "ladakhi",
+    ["lef" ] = "lelemi",
     ["lez" ] = "lezgi",
     ["lij" ] = "ligurian",
     ["lim" ] = "limburgish",
@@ -505,6 +533,7 @@ local languages = allocate {
     ["lmo" ] = "lombard",
     ["lmw" ] = "lomwe",
     ["lom" ] = "loma",
+    ["lpo" ] = "lipo",
     ["lrc" ] = "luri",
     ["lsb" ] = "lower sorbian",
     ["lsm" ] = "lule sami",
@@ -521,7 +550,7 @@ local languages = allocate {
     ["mah" ] = "marshallese",
     ["maj" ] = "majang",
     ["mak" ] = "makhuwa",
-    ["mal" ] = "malayalam reformed",
+    ["mal" ] = "malayalam",
     ["mam" ] = "mam",
     ["man" ] = "mansi",
     ["map" ] = "mapudungun",
@@ -556,6 +585,7 @@ local languages = allocate {
     ["mok" ] = "moksha",
     ["mol" ] = "moldavian",
     ["mon" ] = "mon",
+    ["mnw" ] = "thailand mon",
     ["mor" ] = "moroccan",
     ["mos" ] = "mossi",
     ["mri" ] = "maori",
@@ -594,7 +624,7 @@ local languages = allocate {
     ["nor" ] = "norwegian",
     ["nov" ] = "novial",
     ["nsm" ] = "northern sami",
-    ["nso" ] = "sotho, northern",
+    ["nso" ] = "northern sotho",
     ["nta" ] = "northern tai",
     ["nto" ] = "esperanto",
     ["nym" ] = "nyamwezi",
@@ -642,6 +672,7 @@ local languages = allocate {
     ["rbu" ] = "russian buriat",
     ["rcr" ] = "r-cree",
     ["rej" ] = "rejang",
+    ["rhg" ] = "rohingya",
     ["ria" ] = "riang",
     ["rif" ] = "tarifit",
     ["rit" ] = "ritarungo",
@@ -666,6 +697,7 @@ local languages = allocate {
     ["scs" ] = "north slavey",
     ["sek" ] = "sekota",
     ["sel" ] = "selkup",
+    ["sfm" ] = "small flowery miao",
     ["sga" ] = "old irish",
     ["sgo" ] = "sango",
     ["sgs" ] = "samogitian",
@@ -687,7 +719,7 @@ local languages = allocate {
     ["snk" ] = "soninke",
     ["sog" ] = "sodo gurage",
     ["sop" ] = "songe",
-    ["sot" ] = "sotho, southern",
+    ["sot" ] = "southern sotho",
     ["sqi" ] = "albanian",
     ["srb" ] = "serbian",
     ["srd" ] = "sardinian",
@@ -728,7 +760,9 @@ local languages = allocate {
     ["tht" ] = "tahitian",
     ["tib" ] = "tibetan",
     ["tiv" ] = "tiv",
+    ["tj;" ] = "tai laing",
     ["tkm" ] = "turkmen",
+    ["tli" ] = "tlingit",
     ["tmh" ] = "tamashek",
     ["tmn" ] = "temne",
     ["tna" ] = "tswana",
@@ -742,7 +776,7 @@ local languages = allocate {
     ["tsj" ] = "tshangla",
     ["tua" ] = "turoyo aramaic",
     ["tul" ] = "tulu",
-    ["tum" ] = "tulu",
+    ["tum" ] = "tumbuka",
     ["tuv" ] = "tuvin",
     ["tvl" ] = "tuvalu",
     ["twi" ] = "twi",
@@ -764,6 +798,7 @@ local languages = allocate {
     ["wa"  ] = "wa",
     ["wag" ] = "wagdi",
     ["war" ] = "waray-waray",
+    ["wci" ] = "waci gbe",
     ["wcr" ] = "west-cree",
     ["wel" ] = "welsh",
     ["wlf" ] = "wolof",
@@ -775,17 +810,23 @@ local languages = allocate {
     ["xkf" ] = "khengkha",
     ["xog" ] = "soga",
     ["xpe" ] = "kpelle (liberia)",
+    ["xub" ] = "bette kuruma",
+    ["xuj" ] = "jennu kuruma",
     ["yak" ] = "sakha",
     ["yao" ] = "yao",
     ["yap" ] = "yapese",
     ["yba" ] = "yoruba",
     ["ycr" ] = "y-cree",
+    ["ygp" ] = "gepo",
     ["yic" ] = "yi classic",
     ["yim" ] = "yi modern",
+    ["yna" ] = "aluo",
+    ["ywq" ] = "wuding-luquan",
     ["zea" ] = "zealandic",
     ["zgh" ] = "standard morrocan tamazigh",
     ["zha" ] = "zhuang",
     ["zhh" ] = "chinese, hong kong sar",
+    ["zho" ] = "chinese traditional, macao",
     ["zhp" ] = "chinese phonetic",
     ["zhs" ] = "chinese simplified",
     ["zht" ] = "chinese traditional",
@@ -794,7 +835,6 @@ local languages = allocate {
     ["zza" ] = "zazaki",
 }
 
-
 local features = allocate {
     ["aalt"] = "access all alternates",
     ["abvf"] = "above-base forms",
@@ -811,6 +851,7 @@ local features = allocate {
     ["case"] = "case-sensitive forms",
     ["ccmp"] = "glyph composition/decomposition",
     ["cfar"] = "conjunct form after ro",
+    ["chws"] = "contextual half-width spacing",
     ["cjct"] = "conjunct forms",
     ["clig"] = "contextual ligatures",
     ["cpct"] = "centered cjk punctuation",
@@ -866,7 +907,7 @@ local features = allocate {
     ["nukt"] = "nukta forms",
     ["numr"] = "numerators",
     ["onum"] = "old style figures",
-    ["opbd"] = "optical bounds",
+    ["opbd"] = "optical bounds", -- funny, this is obsolete (too hard?) (and was recomended always true)
     ["ordn"] = "ordinals",
     ["ornm"] = "ornaments",
     ["palt"] = "proportional alternate width",
@@ -887,8 +928,8 @@ local features = allocate {
     ["rtbd"] = "right bounds",
     ["rtla"] = "right-to-left alternates",
     ["rtlm"] = "right to left mirrored forms",
-    ["rvrn"] = "required variation alternates",
     ["ruby"] = "ruby notation forms",
+    ["rvrn"] = "required variation alternates",
     ["salt"] = "stylistic alternates",
     ["sinf"] = "scientific inferiors",
     ["size"] = "optical size", -- now stat table
@@ -928,6 +969,7 @@ local features = allocate {
     ["unic"] = "unicase",
     ["valt"] = "alternate vertical metrics",
     ["vatu"] = "vattu variants",
+    ["vchw"] = "vertical contextual half-width spacing",
     ["vert"] = "vertical writing",
     ["vhal"] = "alternate vertical half metrics",
     ["vjmo"] = "vowel jamo forms",
diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua
index a77fdc020..d56efbbfd 100644
--- a/tex/context/base/mkiv/math-act.lua
+++ b/tex/context/base/mkiv/math-act.lua
@@ -62,6 +62,9 @@ function mathematics.initializeparameters(target,original)
         if not mathparameters.SpaceBeforeScript then
             mathparameters.SpaceBeforeScript = mathparameters.SpaceAfterScript
         end
+        if not mathparameters.SubscriptShiftDownWithSuperscript then
+            mathparameters.SubscriptShiftDownWithSuperscript = mathparameters.SubscriptShiftDown * 1.5
+        end
         target.mathparameters = mathparameters
     end
 end
@@ -155,28 +158,67 @@ function mathematics.overloadparameters(target,original)
                     if trace_defining then
                         report_math("overloading math parameters in %a @ %p",target.properties.fullname,target.parameters.size)
                     end
+                 -- for name, value in next, parameters do
+                 --     local tvalue = type(value)
+                 --     if tvalue == "string" then
+                 --         report_math("comment for math parameter %a: %s",name,value)
+                 --     else
+                 --         local oldvalue = mathparameters[name]
+                 --         local newvalue = oldvalue
+                 --         if oldvalue then
+                 --             if tvalue == "number" then
+                 --                 newvalue = value
+                 --             elseif tvalue == "function" then
+                 --                 newvalue = value(oldvalue,target,original)
+                 --             elseif not tvalue then
+                 --                 newvalue = nil
+                 --             end
+                 --             if trace_defining and oldvalue ~= newvalue then
+                 --                 report_math("overloading math parameter %a: %S => %S",name,oldvalue,newvalue)
+                 --             end
+                 --         else
+                 --          -- report_math("invalid math parameter %a",name)
+                 --         end
+                 --         mathparameters[name] = newvalue
+                 --     end
+                 -- end
+                    for name, value in next, parameters do
+                        local tvalue   = type(value)
+                        local oldvalue = mathparameters[name]
+                        local newvalue = oldvalue
+                        if tvalue == "number" then
+                            newvalue = value
+                        elseif tvalue == "string" then
+                            -- delay till all set
+                        elseif tvalue == "function" then
+                            newvalue = value(oldvalue,target,original)
+                        elseif not tvalue then
+                            newvalue = nil
+                        end
+                        if trace_defining and oldvalue ~= newvalue then
+                            report_math("overloading math parameter %a: %S => %S",name,oldvalue or 0,newvalue)
+                        end
+                        mathparameters[name] = newvalue
+                    end
                     for name, value in next, parameters do
                         local tvalue = type(value)
                         if tvalue == "string" then
-                            report_math("comment for math parameter %a: %s",name,value)
-                        else
-                            local oldvalue = mathparameters[name]
-                            local newvalue = oldvalue
-                            if oldvalue then
-                                if tvalue == "number" then
-                                    newvalue = value
-                                elseif tvalue == "function" then
-                                    newvalue = value(oldvalue,target,original)
-                                elseif not tvalue then
-                                    newvalue = nil
-                                end
-                                if trace_defining and oldvalue ~= newvalue then
-                                    report_math("overloading math parameter %a: %S => %S",name,oldvalue,newvalue)
+                            local newvalue = mathparameters[value]
+                            if not newvalue then
+                                local code = loadstring("return " .. value,"","t",mathparameters)
+                                if type(code) == "function" then
+                                    local okay, v = pcall(code)
+                                    if okay then
+                                        newvalue = v
+                                    end
                                 end
-                            else
-                             -- report_math("invalid math parameter %a",name)
                             end
-                            mathparameters[name] = newvalue
+                            if newvalue then
+                                -- split in number and string
+                                mathparameters[name] = newvalue
+                            elseif trace_defining then
+                                report_math("ignoring math parameter %a: %S",name,value)
+                            end
                         end
                     end
                 end
diff --git a/tex/context/base/mkiv/math-dim.lua b/tex/context/base/mkiv/math-dim.lua
index 06b4bbd97..c46e16faf 100644
--- a/tex/context/base/mkiv/math-dim.lua
+++ b/tex/context/base/mkiv/math-dim.lua
@@ -132,7 +132,6 @@ end
 
 function mathematics.dimensions(dimens)  -- beware, dimens get spoiled
     if dimens.SpaceAfterScript then
-        dimens.SubscriptShiftDownWithSuperscript = dimens.SubscriptShiftDown * 1.5 -- move this one
         return table.fastcopy(dimens), { }
     elseif dimens.AxisHeight or dimens.axis_height then
         local t = { }
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 32b8aa440..891b795ad 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -266,6 +266,7 @@ return {
   "alltextstyles",
   "alluncrampedstyles",
   "allunsplitstyles",
+  "amcode",
   "atendofgroup",
   "atendofgrouped",
   "attribute",
@@ -297,6 +298,7 @@ return {
   "boxymove",
   "boxyoffset",
   "catcodetable",
+  "cfcode",
   "clearmarks",
   "copymathatomrule",
   "copymathparent",
@@ -305,6 +307,7 @@ return {
   "crampedscriptscriptstyle",
   "crampedscriptstyle",
   "crampedtextstyle",
+  "csactive",
   "csstring",
   "currentloopiterator",
   "currentloopnesting",
@@ -328,6 +331,7 @@ return {
   "everytab",
   "exceptionpenalty",
   "expand",
+  "expandactive",
   "expandafterpars",
   "expandafterspaces",
   "expandcstoken",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index c5ec75d70..da390abd8 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 afc189b09..ffd8cb5f2 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf