ConTeXt 2012.05.14 16:00

git-svn-id: svn://tug.org/texlive/trunk@26371 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 339 insertions, 70 deletions

diff --git a/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg b/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg
index d5c902c6bf0..794b9f4079c 100644
--- a/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg
+++ b/Master/texmf-dist/tex/context/fonts/antykwapoltawskiego.lfg
@@ -1,5 +1,5 @@
 return {
-    name = "antykwapoltawskiego",
+    name = "antykwa-poltawskiego",
     version = "1.00",
     comment = "Goodies that complement Antykwa Poltawskiego, one of Mojca's favourites",
     author = "Hans & Mojca",
diff --git a/Master/texmf-dist/tex/context/fonts/asana-math.lfg b/Master/texmf-dist/tex/context/fonts/asana-math.lfg
index f845ca4dee1..2c13600c198 100644
--- a/Master/texmf-dist/tex/context/fonts/asana-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/asana-math.lfg
@@ -14,9 +14,22 @@ local function patch(data,filename,threshold)
     end
 end
 
-patches.register("after","check math parameters","asana",function(data,filename) patch(data,filename,1350) end)
+patches.register("after","analyze math","asana",function(data,filename) patch(data,filename,1350) end)
+
+local function less(value,target,original)
+    -- officially we should check the original
+    return 0.25 * value
+end
+
+local function more(value,target,original)
+    local o = original.mathparameters.DisplayOperatorMinHeight
+    if o < 2800 then
+        return 2800 * target.parameters.factor
+    else
+        return value -- already scaled
+    end
+end
 
-local function less(value,target,original) return 0.25 * value end
 
 return {
     name = "asana-math",
@@ -26,6 +39,7 @@ return {
     copyright = "ConTeXt development team",
     mathematics = {
         parameters = {
+            DisplayOperatorMinHeight         = more,
          -- StackBottomDisplayStyleShiftDown = 0,
          -- StackBottomShiftDown             = 0,
          -- StackDisplayStyleGapMin          = 0,
diff --git a/Master/texmf-dist/tex/context/fonts/cambria-math.lfg b/Master/texmf-dist/tex/context/fonts/cambria-math.lfg
index 3fd15d8a03d..6415069e66e 100644
--- a/Master/texmf-dist/tex/context/fonts/cambria-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/cambria-math.lfg
@@ -1,6 +1,11 @@
 -- This patch code is moved from font-pat.lua to this goodies
 -- files as it does not belong in the core code.
 
+-- This is a fix to the font itself i.e. the cached instance will
+-- be patched. When the goodie file is loaded the patch will be
+-- added to the patch list. No goodies setting is needed with
+-- the filename.
+
 local patches = fonts.handlers.otf.enhancers.patches
 
 local function patch(data,filename,threshold)
@@ -14,8 +19,21 @@ local function patch(data,filename,threshold)
     end
 end
 
-patches.register("after","check math parameters","cambria", function(data,filename) patch(data,filename,2800) end)
-patches.register("after","check math parameters","cambmath",function(data,filename) patch(data,filename,2800) end)
+patches.register("after","analyze math","cambria", function(data,filename) patch(data,filename,2800) end)
+patches.register("after","analyze math","cambmath",function(data,filename) patch(data,filename,2800) end)
+
+-- This is a runtime fix, but then we need to explicitly set
+-- the goodies parameter for the font. As a demonstration we
+-- we do both.
+
+local function FixDisplayOperatorMinHeight(value,target,original)
+    local o = original.mathparameters.DisplayOperatorMinHeight
+    if o < 2800 then
+        return 2800 * target.parameters.factor
+    else
+        return value -- already scaled
+    end
+end
 
 return {
     name = "cambria-math",
@@ -23,4 +41,9 @@ return {
     comment = "Goodies that complement cambria.",
     author = "Hans Hagen",
     copyright = "ConTeXt development team",
+    mathematics = {
+        parameters = {
+            DisplayOperatorMinHeight = FixDisplayOperatorMinHeight,
+        }
+    }
 }
diff --git a/Master/texmf-dist/tex/context/fonts/demo.lfg b/Master/texmf-dist/tex/context/fonts/demo.lfg
index 6c7f6b62d39..00ca3ee6e73 100644
--- a/Master/texmf-dist/tex/context/fonts/demo.lfg
+++ b/Master/texmf-dist/tex/context/fonts/demo.lfg
@@ -1,3 +1,5 @@
+-- see test suite: goodies-002.tex
+
 local yes = "yes"
 
 local default = {
@@ -12,7 +14,7 @@ local smallcaps = {
 }
 
 local function statistics(tfmdata)
-    commands.showfontparameters
+    commands.showfontparameters(tfmdata)
 end
 
 local function squeeze(tfmdata)
@@ -24,7 +26,7 @@ end
 
 return {
     name = "demo",
-    version = "1.00",
+    version = "1.01",
     comment = "An example of goodies.",
     author = "Hans Hagen",
     featuresets = {
@@ -43,7 +45,17 @@ return {
             [2] = {
                 "two", "four", "six", "eight", "ten",
             },
-        }
+        },
+        all = {
+            [1] = {
+                "*",
+            },
+        },
+        some = {
+            [1] = {
+                "0x0030:0x0035",
+            },
+        },
     },
     postprocessors = {
         statistics = statistics,
diff --git a/Master/texmf-dist/tex/context/fonts/lm-math.lfg b/Master/texmf-dist/tex/context/fonts/lm-math.lfg
index 43de0c51ef1..a2c095bc2b5 100644
--- a/Master/texmf-dist/tex/context/fonts/lm-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/lm-math.lfg
@@ -1,33 +1,38 @@
--- This patch code is moved from font-pat.lua to this goodies
--- files as it does not belomg in the core code.
-
-local patches = fonts.handlers.otf.enhancers.patches
+-- we could consider taking more from 'tex-mr-missing'
 
-local function patch(data,filename)
-    local uni_to_ind = data.map.map
-    if not uni_to_ind[0x391] then
-        -- beware, this is a hack, features for latin often don't apply to greek
-        -- but lm has not much features anyway (and only greek for math)
-        patches.report("adding 13 greek capitals")
-        uni_to_ind[0x391] = uni_to_ind[0x41]
-        uni_to_ind[0x392] = uni_to_ind[0x42]
-        uni_to_ind[0x395] = uni_to_ind[0x45]
-        uni_to_ind[0x397] = uni_to_ind[0x48]
-        uni_to_ind[0x399] = uni_to_ind[0x49]
-        uni_to_ind[0x39A] = uni_to_ind[0x4B]
-        uni_to_ind[0x39C] = uni_to_ind[0x4D]
-        uni_to_ind[0x39D] = uni_to_ind[0x4E]
-        uni_to_ind[0x39F] = uni_to_ind[0x4F]
-        uni_to_ind[0x3A1] = uni_to_ind[0x52]
-        uni_to_ind[0x3A4] = uni_to_ind[0x54]
-        uni_to_ind[0x3A7] = uni_to_ind[0x58]
-        uni_to_ind[0x396] = uni_to_ind[0x5A]
-    end
-end
+-- This patch code is moved from font-pat.lua to this goodies
+-- files as it does not belong in the core code.
 
-patches.register("after","prepare glyphs","^lmroman",     patch)
-patches.register("after","prepare glyphs","^lmsans",      patch)
-patches.register("after","prepare glyphs","^lmtypewriter",patch)
+-- This patch is no longer needed but we keep it commented as
+-- it is an example.
+--
+-- local patches = fonts.handlers.otf.enhancers.patches
+--
+-- local function patch(data,filename)
+--     local uni_to_ind = data.map.map
+--     if not uni_to_ind[0x391] then
+--         -- beware, this is a hack, features for latin often don't apply to greek
+--         -- but lm has not much features anyway (and only greek for math)
+--         patches.report("adding 13 greek capitals")
+--         uni_to_ind[0x391] = uni_to_ind[0x41]
+--         uni_to_ind[0x392] = uni_to_ind[0x42]
+--         uni_to_ind[0x395] = uni_to_ind[0x45]
+--         uni_to_ind[0x397] = uni_to_ind[0x48]
+--         uni_to_ind[0x399] = uni_to_ind[0x49]
+--         uni_to_ind[0x39A] = uni_to_ind[0x4B]
+--         uni_to_ind[0x39C] = uni_to_ind[0x4D]
+--         uni_to_ind[0x39D] = uni_to_ind[0x4E]
+--         uni_to_ind[0x39F] = uni_to_ind[0x4F]
+--         uni_to_ind[0x3A1] = uni_to_ind[0x52]
+--         uni_to_ind[0x3A4] = uni_to_ind[0x54]
+--         uni_to_ind[0x3A7] = uni_to_ind[0x58]
+--         uni_to_ind[0x396] = uni_to_ind[0x5A]
+--     end
+-- end
+--
+-- patches.register("after","prepare glyphs","^lmroman",     patch)
+-- patches.register("after","prepare glyphs","^lmsans",      patch)
+-- patches.register("after","prepare glyphs","^lmtypewriter",patch)
 
 -- rm-lmr5  : LMMathRoman5-Regular
 -- rm-lmbx5 : LMMathRoman5-Bold          ]
@@ -179,33 +184,13 @@ local ten = {
     { name = "eufb10.tfm", vector = "tex-fraktur-bold", optional=true },
 }
 
-local ten_bold = {
-    { name = "lmroman10-bold.otf", features = "virtualmath", main = true },
-    { name = "rm-lmr10.tfm", vector = "tex-mr-missing" } ,
-    { name = "lmmib10.tfm", vector = "tex-mi", skewchar=0x7F },
-    { name = "lmmib10.tfm", vector = "tex-it", skewchar=0x7F },
-    { name = "lmbsy10.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-    { name = "lmex10.tfm", vector = "tex-ex", extension = true } ,
--- copied from roman:
-    { name = "msam10.tfm", vector = "tex-ma" },
-    { name = "msbm10.tfm", vector = "tex-mb" },
-    { name = "stmary10.afm", vector = "tex-mc" },
- -- { name = "rm-lmbx10.tfm", vector = "tex-bf" } ,
-    { name = "lmroman10-bold.otf", vector = "tex-bf" } ,
-    { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
-    { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
-    { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
-    { name = "eufm10.tfm", vector = "tex-fraktur", optional=true },
-    { name = "eufb10.tfm", vector = "tex-fraktur-bold", optional=true },
-}
-
 -- rm-lmr12  : LMMathRoman12-Regular
 -- rm-lmbx12 : LMMathRoman12-Bold
 -- lmmi12    : LMMathItalic12-Italic
 
 local twelve = {
     { name = "lmroman12-regular.otf", features = "virtualmath", main = true },
-    { name = "rm-lmr12.tfm", vector = "tex-mr-missing" } ,
+    { name = "rm-lmr12.tfm", vector = "tex-mr-missing" },
     { name = "lmmi12.tfm", vector = "tex-mi", skewchar=0x7F },
     { name = "lmmi12.tfm", vector = "tex-it", skewchar=0x7F },
     { name = "lmsy10.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
@@ -256,15 +241,14 @@ return {
             "mkiv-base.map",
         },
         virtuals = {
-            ["lmroman5-math"]      = five,
-            ["lmroman6-math"]      = six,
-            ["lmroman7-math"]      = seven,
-            ["lmroman8-math"]      = eight,
-            ["lmroman9-math"]      = nine,
-            ["lmroman10-math"]     = ten,
-            ["lmroman10-boldmath"] = ten_bold,
-            ["lmroman12-math"]     = twelve,
-            ["lmroman17-math"]     = seventeen,
+            ["lmroman5-math"]  = five,
+            ["lmroman6-math"]  = six,
+            ["lmroman7-math"]  = seven,
+            ["lmroman8-math"]  = eight,
+            ["lmroman9-math"]  = nine,
+            ["lmroman10-math"] = ten,
+            ["lmroman12-math"] = twelve,
+            ["lmroman17-math"] = seventeen,
         },
         variables = {
             joinrelfactor = 3, -- default anyway
diff --git a/Master/texmf-dist/tex/context/fonts/lm.lfg b/Master/texmf-dist/tex/context/fonts/lm.lfg
new file mode 100644
index 00000000000..406902ef2bc
--- /dev/null
+++ b/Master/texmf-dist/tex/context/fonts/lm.lfg
@@ -0,0 +1,199 @@
+return {
+    name = "latin modern",
+    version = "1.00",
+    comment = "Goodies that complement latin modern.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        tweaks = {
+            aftercopying = {
+                mathematics.tweaks.fixbadprime, -- prime is too low
+            },
+        },
+    },
+    designsizes = {
+        ["LMMathRoman-Regular"] = {
+            ["4pt"]  = "LMMath5-Regular@lmroman5-math",
+            ["5pt"]  = "LMMath5-Regular@lmroman5-math",
+            ["6pt"]  = "LMMath6-Regular@lmroman6-math",
+            ["7pt"]  = "LMMath7-Regular@lmroman7-math",
+            ["8pt"]  = "LMMath8-Regular@lmroman8-math",
+            ["9pt"]  = "LMMath9-Regular@lmroman9-math",
+            ["10pt"] = "LMMath10-Regular@lmroman10-math",
+            ["11pt"] = "LMMath10-Regular@lmroman10-math",
+            ["12pt"] = "LMMath12-Regular@lmroman12-math",
+            default  = "LMMath10-Regular@lmroman10-math"
+        },
+        ["LMMathRoman-Bold"] = { -- not yet ready
+            ["4pt"]  = "LMMath5-Regular@lmroman5-math",
+            ["5pt"]  = "LMMath5-Regular@lmroman5-math",
+            ["6pt"]  = "LMMath6-Regular@lmroman6-math",
+            ["7pt"]  = "LMMath7-Regular@lmroman7-math",
+            ["8pt"]  = "LMMath8-Regular@lmroman8-math",
+            ["9pt"]  = "LMMath9-Regular@lmroman9-math",
+            ["10pt"] = "LMMath10-Regular@lmroman10-math",
+            ["11pt"] = "LMMath10-Regular@lmroman10-math",
+            ["12pt"] = "LMMath12-Regular@lmroman12-math",
+            default  = "LMMath10-Regular@lmroman10-math"
+        },
+        ["LMRoman-Regular"] = {
+            ["4pt"]  = "file:lmroman5-regular",
+            ["5pt"]  = "file:lmroman5-regular",
+            ["6pt"]  = "file:lmroman6-regular",
+            ["7pt"]  = "file:lmroman7-regular",
+            ["8pt"]  = "file:lmroman8-regular",
+            ["9pt"]  = "file:lmroman9-regular",
+            ["10pt"] = "file:lmroman10-regular",
+            ["11pt"] = "file:lmroman10-regular",
+            ["12pt"] = "file:lmroman12-regular",
+            default  = "file:lmroman10-regular",
+        },
+        ["LMRoman-Bold"] = {
+            ["4pt"]  = "file:lmroman5-bold",
+            ["5pt"]  = "file:lmroman5-bold",
+            ["6pt"]  = "file:lmroman6-bold",
+            ["7pt"]  = "file:lmroman7-bold",
+            ["8pt"]  = "file:lmroman8-bold",
+            ["9pt"]  = "file:lmroman9-bold",
+            ["10pt"] = "file:lmroman10-bold",
+            ["11pt"] = "file:lmroman10-bold",
+            ["12pt"] = "file:lmroman12-bold",
+            default  = "file:lmroman10-bold",
+        },
+        ["LMRoman-Demi"] = {
+            default  = "file:lmromandemi10-regular",
+        },
+        ["LMRoman-Italic"] = {
+            ["4pt"]  = "file:lmroman7-italic",
+            ["5pt"]  = "file:lmroman7-italic",
+            ["6pt"]  = "file:lmroman7-italic",
+            ["7pt"]  = "file:lmroman7-italic",
+            ["8pt"]  = "file:lmroman8-italic",
+            ["9pt"]  = "file:lmroman9-italic",
+            ["10pt"] = "file:lmroman10-italic",
+            ["11pt"] = "file:lmroman10-italic",
+            ["12pt"] = "file:lmroman12-italic",
+            default  = "file:lmroman10-italic",
+        },
+        ["LMRoman-Oblique"] = {
+            ["4pt"]  = "file:lmromanslant8-regular",
+            ["5pt"]  = "file:lmromanslant8-regular",
+            ["6pt"]  = "file:lmromanslant8-regular",
+            ["7pt"]  = "file:lmromanslant8-regular",
+            ["8pt"]  = "file:lmromanslant8-regular",
+            ["9pt"]  = "file:lmromanslant9-regular",
+            ["10pt"] = "file:lmromanslant10-regular",
+            ["11pt"] = "file:lmromanslant10-regular",
+            ["12pt"] = "file:lmromanslant12-regular",
+            default  = "file:lmromanslant10-regular",
+        },
+        ["LMRoman-BoldItalic"] = {
+            default  = "file:lmroman10-bolditalic",
+        },
+        ["LMRoman-BoldOblique"] = {
+            default  = "file:lmromanslant10-bold",
+        },
+        ["LMRoman-DemiOblique"] = {
+            default  = "file:lmromandemi10-oblique",
+        },
+        ["LMRoman-CapsRegular"] = {
+            default  = "file:lmromancaps10-regular",
+        },
+        ["LMRoman-CapsOblique"] = {
+            default  = "file:lmromancaps10-oblique",
+        },
+        ["LMRoman-Dunhill"] = {
+            default  = "file:lmromandunh10-regular",
+        },
+        ["LMRoman-DunhillOblique"] = {
+            default  = "file:lmromandunh10-oblique",
+        },
+        ["LMRoman-Unslanted"] = {
+            default  = "file:lmromanunsl10-regular",
+        },
+        ["LMSans-Regular"] = {
+            ["8pt"]  = "file:lmsans8-regular",
+            ["9pt"]  = "file:lmsans9-regular",
+            ["10pt"] = "file:lmsans10-regular",
+            ["11pt"] = "file:lmsans10-regular",
+            ["12pt"] = "file:lmsans12-regular",
+            default  = "file:lmsans10-regular",
+        },
+        ["LMSans-Oblique"] = {
+            ["8pt"]  = "file:lmsans8-oblique",
+            ["9pt"]  = "file:lmsans9-oblique",
+            ["10pt"] = "file:lmsans10-oblique",
+            ["11pt"] = "file:lmsans10-oblique",
+            ["12pt"] = "file:lmsans12-oblique",
+            default  = "file:lmsans10-oblique",
+        },
+        ["LMSans-Bold"] = {
+            default  = "file:lmsans10-bold",
+        },
+        ["LMSans-BoldOblique"] = {
+            default  = "file:lmsans10-boldoblique",
+        },
+        ["LMSans-DemiCondensed"] = {
+            default  = "file:lmsansdemicond10-regular",
+        },
+        ["LMSans-DemiCondensedOblique"] = {
+            default  = "file:lmsansdemicond10-oblique",
+        },
+        ["LMTypewriter-Regular"] = {
+            ["8pt"]  = "file:lmmono8-regular",
+            ["9pt"]  = "file:lmmono9-regular",
+            ["10pt"] = "file:lmmono10-regular",
+            ["11pt"] = "file:lmmono10-regular",
+            ["12pt"] = "file:lmmono12-regular",
+            default  = "file:lmmono10-regular",
+        },
+        ["LMTypewriter-Light"] = {
+            default  = "file:lmmonolt10-regular",
+        },
+        ["LMTypewriter-Dark"] = {
+            default  = "file:lmmonolt10-bold",
+        },
+        ["LMTypewriter-Italic"] = {
+            default  = "file:lmmono10-italic",
+        },
+        ["LMTypewriter-LightOblique"] = {
+            default  = "file:lmmonolt10-oblique",
+        },
+        ["LMTypewriter-Oblique"] = {
+            default  = "file:lmmonoslant10-regular",
+        },
+        ["LMTypewriter-DarkOblique"] = {
+            default  = "file:lmmonolt10-boldoblique",
+        },
+        ["LMTypewriter-LightCondensed"] = {
+            default  = "file:lmmonoltcond10-regular",
+        },
+        ["LMTypewriter-LightCondensedOblique"] = {
+            default  = "file:lmmonoltcond10-oblique",
+        },
+        ["LMTypewriterVarWd-Regular"] = {
+            default  = "file:lmmonoproplt10-regular",
+        },
+        ["LMTypewriterVarWd-Oblique"] = {
+            default  = "file:lmmonoproplt10-oblique",
+        },
+        ["LMTypewriterVarWd-Light"] = {
+            default  = "file:lmmonoprop10-regular",
+        },
+        ["LMTypewriterVarWd-LightOblique"] = {
+            default  = "file:lmmonoprop10-oblique",
+        },
+        ["LMTypewriterVarWd-Dark"] = {
+            default  = "file:lmmonoproplt10-bold",
+        },
+        ["LMTypewriterVarWd-DarkOblique"] = {
+            default  = "file:lmmonoproplt10-boldoblique",
+        },
+        ["LMTypewriter-CapsRegular"] = {
+            default  = "file:lmmonocaps10-regular",
+        },
+        ["LMTypewriter-CapsOblique"] = {
+            default  = "file:lmmonocaps10-oblique",
+        },
+    }
+}
diff --git a/Master/texmf-dist/tex/context/fonts/lucida-opentype-math.lfg b/Master/texmf-dist/tex/context/fonts/lucida-opentype-math.lfg
new file mode 100644
index 00000000000..38d54eee325
--- /dev/null
+++ b/Master/texmf-dist/tex/context/fonts/lucida-opentype-math.lfg
@@ -0,0 +1,12 @@
+return {
+    name = "lucida-opentype-math",
+    version = "1.00",
+    comment = "Goodies that complement lucida opentype.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        alternates = {
+            italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Italic" },
+        }
+    }
+}
diff --git a/Master/texmf-dist/tex/context/fonts/lucida-math.lfg b/Master/texmf-dist/tex/context/fonts/lucida-typeone-math.lfg
index 443f52acea2..82ba589cd48 100644
--- a/Master/texmf-dist/tex/context/fonts/lucida-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/lucida-typeone-math.lfg
@@ -225,6 +225,8 @@ mathencodings["lbr-mb"] = {
     [0x022CC] = 0xD1, -- rightthreetimes
     [0x022D6] = 0xDC, -- lessdot
     [0x022D7] = 0xDD, -- gtrdot
+    [0x022D8] = 0xDE, -- lll
+    [0x022D9] = 0xDF, -- ggg
     [0x022DA] = 0xE8, -- lesseqgtr
     [0x022DB] = 0xE9, -- gtreqless
     [0x022DE] = 0xE6, -- curlyeqprec
@@ -268,6 +270,7 @@ mathencodings["lbr-sy"] = {
     [0x02235] = 0x91, -- because
     [0x0223D] = 0x24, -- backsim
     [0x02242] = 0x99, -- eqsim
+    [0x02245] = 0x9B, -- cong
     [0x0224A] = 0x9D, -- approxeq
     [0x0224E] = 0xC7, -- Bumpeq
     [0x02252] = 0xCB, -- fallingdotseq
@@ -328,6 +331,9 @@ return {
                 { name = "hlcrv.tfm", vector = "tex-ex", extension = true },
                 { name = "hlcra.tfm", vector = "lbr-ma" },
                 { name = "hlcrm.tfm", vector = "lbr-mb" },
+             -- { name = "hlcrim.tfm", vector = "lbr-mb" },  -- LucidaNewMath-Italic     <-> AltItalic
+             -- { name = "hlcdim.tfm", vector = "lbr-mb" },  -- LucidaNewMath-DemiItalic <-> AltDemiItalic
+             -- { name = "hlcrima.tfm", vector = "lbr-mb" }, -- LucidaNewMath-AltItalic <-> Italic
                 { name = "file:lbd.afm", vector = "tex-bf" },
                 { name = "file:lbdi.afm", vector = "tex-bi" } ,
                 { name = "file:lsr.afm", vector = "tex-ss" },
diff --git a/Master/texmf-dist/tex/context/fonts/px-math.lfg b/Master/texmf-dist/tex/context/fonts/px-math.lfg
index 1d18bad361a..afb0270a202 100644
--- a/Master/texmf-dist/tex/context/fonts/px-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/px-math.lfg
@@ -11,6 +11,7 @@ return {
         virtuals = {
             ["px-math"] = {
                 { name = "texgyrepagella-regular.otf", features = "virtualmath", main = true },
+                { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" } ,
                 { name = "rpxr.tfm", vector = "tex-mr" } ,
                 { name = "rpxmi.tfm", vector = "tex-mi", skewchar=0x7F },
                 { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F },
diff --git a/Master/texmf-dist/tex/context/fonts/tx-math.lfg b/Master/texmf-dist/tex/context/fonts/tx-math.lfg
index 8423aaaf4ab..2ad17348659 100644
--- a/Master/texmf-dist/tex/context/fonts/tx-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/tx-math.lfg
@@ -11,6 +11,7 @@ return {
         virtuals = {
             ["tx-math"] = {
                 { name = "texgyretermes-regular.otf", features = "virtualmath", main = true },
+                { name = "texgyretermes-regular.otf", features = "virtualmath", vector = "tex-mr-missing" },
                 { name = "rtxr.tfm", vector = "tex-mr" } ,
                 { name = "rtxptmri.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "rtxmi.tfm", vector = "tex-mi", skewchar=0x7F },
diff --git a/Master/texmf-dist/tex/context/fonts/xits-math.lfg b/Master/texmf-dist/tex/context/fonts/xits-math.lfg
index a97a7599d9b..24ed2b0aaff 100644
--- a/Master/texmf-dist/tex/context/fonts/xits-math.lfg
+++ b/Master/texmf-dist/tex/context/fonts/xits-math.lfg
@@ -1,8 +1,21 @@
 -- \setupbodyfont[xits]
 --
--- \starttext
---     $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$
--- \stoptext
+-- $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$
+--
+-- \setupmathematics[italics=1] test $a;b;a; b; f;$ test\par % fontitalics
+-- \setupmathematics[italics=2] test $a;b;a; b; f;$ test\par % fontdata
+-- \setupmathematics[italics=3] test $a;b;a; b; f;$ test\par % quad based
+-- \setupmathematics[italics=4] test $a;b;a; b; f;$ test\par % combination of 1 and 3
+
+local italics = {
+    defaultfactor = 0.025,
+    disableengine = true,
+    corrections   = {
+     -- [0x1D44E] = 0.99,    -- a (fraction of quad)
+     -- [0x1D44F] = 100,     -- b (font points)
+        [0x1D453] = -0.0375, -- f
+    }
+}
 
 return {
     name = "xits-math",
@@ -11,6 +24,9 @@ return {
     author = "Hans Hagen",
     copyright = "ConTeXt development team",
     mathematics = {
+        italics = {
+            ["xits-math"] = italics,
+        },
         alternates = {
             cal       = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" },
             greekssup = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" },
@@ -20,6 +36,7 @@ return {
             mathbbit  = { feature = 'ss06', value = 1, comment = "Mathematical Italic Double-Struck Alphabet" },
             mathbbbi  = { feature = 'ss07', value = 1, comment = "Mathematical Bold Italic Double-Struck Alphabet" },
             upint     = { feature = 'ss08', value = 1, comment = "Upright Integrals" },
-        }
+            vertnot   = { feature = 'ss09', value = 1, comment = "Negated Symbols With Vertical Stroke" },
+        },
     }
 }