2022-11-18 13:17:00

17 files changed, 129 insertions, 87 deletions

diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg
index cc7ae23dc..dfce35d80 100644
--- a/tex/context/fonts/mkiv/bonum-math.lfg
+++ b/tex/context/fonts/mkiv/bonum-math.lfg
@@ -131,12 +131,12 @@ return {
                         [0x27EB]                = { topright = -0.1,  bottomright = -0.1  },
                         ["0x27EB.variants.*"]   = { topright = -0.2,  bottomright = -0.2  },
                         --
-                        -- [0x222B] = integral_variants, ["0x222B.variants.*"] = integral_variants, ["0x222B.parts.top"] = integral_top, 
+                        -- [0x222B] = integral_variants, ["0x222B.variants.*"] = integral_variants, ["0x222B.parts.top"] = integral_top,
                         ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int
                         ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint
                         ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint
                         ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint
-                        -- [0x222C] = integral_variants, ["0x222C.variants.*"] = integral_variants, ["0x222C.parts.top"] = integral_top, 
+                        -- [0x222C] = integral_variants, ["0x222C.variants.*"] = integral_variants, ["0x222C.parts.top"] = integral_top,
                         -- [0x222D] = integral_variants, ["0x222D.variants.*"] = integral_variants, ["0x222D.parts.top"] = integral_top, ["0x222D.parts.bottom"] = integral_bottom,
                         -- [0x222E] = integral_variants, ["0x222E.variants.*"] = integral_variants, ["0x222E.parts.top"] = integral_top, ["0x222E.parts.bottom"] = integral_bottom,
                         -- [0x222F] = integral_variants, ["0x222F.variants.*"] = integral_variants, ["0x222F.parts.top"] = integral_top, ["0x222F.parts.bottom"] = integral_bottom,
@@ -228,24 +228,24 @@ return {
                         [0x1D713] = { left = -.1,  right = -.1 }, -- italic psi
                         [0x1D714] = { left = -.1,  right = -.1 }, -- italic omega
 
-                        [0x003B1] = { left = -.1,  right = -.1 }, -- upfight alpha
-                        [0x003B3] = { left = -.1,  right = -.1 }, -- upfight gamma
-                        [0x003BA] = { left = -.1,  right = -.1 }, -- upfight kappa
-                        [0x003BC] = { left = -.1,  right = -.1 }, -- upfight mu
-                        [0x003C0] = { left = -.1,  right = -.1 }, -- upfight pi
-                        [0x003C3] = { left = -.1,  right = -.1 }, -- upfight sigma
-                        [0x003C5] = { left = -.1,  right = -.1 }, -- upfight upsilon
-                        [0x003C6] = { left = -.1,  right = -.1 }, -- upfight phi
-                        [0x003C8] = { left = -.1,  right = -.1 }, -- upfight psi
-                        [0x003C9] = { left = -.1,  right = -.1 }, -- upfight omega
+                        [0x003B1] = { left = -.1,  right = -.1 }, -- upright alpha
+                        [0x003B3] = { left = -.1,  right = -.1 }, -- upright gamma
+                        [0x003BA] = { left = -.1,  right = -.1 }, -- upright kappa
+                        [0x003BC] = { left = -.1,  right = -.1 }, -- upright mu
+                        [0x003C0] = { left = -.1,  right = -.1 }, -- upright pi
+                        [0x003C3] = { left = -.1,  right = -.1 }, -- upright sigma
+                        [0x003C5] = { left = -.1,  right = -.1 }, -- upright upsilon
+                        [0x003C6] = { left = -.1,  right = -.1 }, -- upright phi
+                        [0x003C8] = { left = -.1,  right = -.1 }, -- upright psi
+                        [0x003C9] = { left = -.1,  right = -.1 }, -- upright omega
 
                         -- Greek lowercase sans (bold, italic) can be improved
 
                         [0x1D451] = { left = -.1,  right = -.1 }, -- italic d
                         [0x1D453] = { left = -.1,  right = -.1 }, -- italic f
 
-                        [0x00394] = { left =  .1,  right =  .1 }, -- upfight Delta
-                        [0x003A3] = { left =  .1,  right =  .1 }, -- upfight Sigma
+                        [0x00394] = { left =  .1,  right =  .1 }, -- upright Delta
+                        [0x003A3] = { left =  .1,  right =  .1 }, -- upright Sigma
 
                      -- [0x0004A] = { left =  .1,  right =  .1 }, -- J
                         [0x00046] = { left =  .1,  right =  .1 }, -- F
diff --git a/tex/context/fonts/mkiv/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg
index 8feb94bcf..97cea6674 100644
--- a/tex/context/fonts/mkiv/cambria-math.lfg
+++ b/tex/context/fonts/mkiv/cambria-math.lfg
@@ -204,7 +204,7 @@ return {
                 },
                 {
                     tweak = "addfourier",
-                    variant = 1,
+                    variant = 2,
                 },
                 -- { -- the ldots are squareshaped and the cdots are circular
                 --     tweak = "fixellipses",
diff --git a/tex/context/fonts/mkiv/concrete-math.lfg b/tex/context/fonts/mkiv/concrete-math.lfg
index 31ee4f1b9..c107cfdeb 100644
--- a/tex/context/fonts/mkiv/concrete-math.lfg
+++ b/tex/context/fonts/mkiv/concrete-math.lfg
@@ -75,6 +75,10 @@ return {
                     tweak = "addequals",
                 },
                 {
+                    tweak = "addfourier",
+                    variant = 2,
+                },
+                {
                     tweak = "setoptions",
                     set   = { "ignorekerndimensions" }
                 },
diff --git a/tex/context/fonts/mkiv/ebgaramond-math.lfg b/tex/context/fonts/mkiv/ebgaramond-math.lfg
index 555b79bc1..afdd66279 100644
--- a/tex/context/fonts/mkiv/ebgaramond-math.lfg
+++ b/tex/context/fonts/mkiv/ebgaramond-math.lfg
@@ -230,7 +230,7 @@ return {
                 },
                 {
                     tweak = "addfourier",
-                    variant = 1,
+                    variant = 2,
                 },
                 -- this is the mkiv section
                 {
diff --git a/tex/context/fonts/mkiv/erewhon-math.lfg b/tex/context/fonts/mkiv/erewhon-math.lfg
index 89b788b3f..cf2e7f28c 100644
--- a/tex/context/fonts/mkiv/erewhon-math.lfg
+++ b/tex/context/fonts/mkiv/erewhon-math.lfg
@@ -110,6 +110,10 @@ return {
                     tweak = "addequals",
                 },
                 {
+                    tweak = "addfourier",
+                    variant = 2,
+                },
+                {
                     tweak = "setoptions",
 --                     set   = { "ignorekerndimensions" }
                 },
diff --git a/tex/context/fonts/mkiv/kpfonts-math.lfg b/tex/context/fonts/mkiv/kpfonts-math.lfg
index 8f2153077..385170aab 100644
--- a/tex/context/fonts/mkiv/kpfonts-math.lfg
+++ b/tex/context/fonts/mkiv/kpfonts-math.lfg
@@ -138,6 +138,10 @@ return {
                     tweak = "addequals",
                 },
                 {
+                    tweak = "addfourier",
+                    variant = 2,
+                },
+                {
                     tweak = "setoptions",
                     set   = { "ignorekerndimensions" }
                 },
diff --git a/tex/context/fonts/mkiv/stixtwo-math.lfg b/tex/context/fonts/mkiv/stixtwo-math.lfg
index ab5b884ad..8e5489830 100644
--- a/tex/context/fonts/mkiv/stixtwo-math.lfg
+++ b/tex/context/fonts/mkiv/stixtwo-math.lfg
@@ -111,7 +111,7 @@ return {
                         ["0x222B.parts.bottom"] = { bottomright = -0.30 }, -- int
                         -- ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint does not exist
                         -- ["0x222D.parts.bottom"] = { bottomright = -0.10 }, -- iiint does not exist
-                        -- ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint does not exist  
+                        -- ["0x2A0C.parts.bottom"] = { bottomright = -0.05 }, -- iiiint does not exist
                         -- -- ["0x222B.variants.*"] = integral_variants, ["0x222B.parts.top"] = integral_top, ["0x222B.parts.bottom"] = integral_bottom,
                         -- ["0x222C.variants.*"] = integral_variants, ["0x222C.parts.top"] = integral_top, ["0x222C.parts.bottom"] = integral_bottom,
                         -- ["0x222D.variants.*"] = integral_variants, ["0x222D.parts.top"] = integral_top, ["0x222D.parts.bottom"] = integral_bottom,
@@ -209,6 +209,9 @@ return {
                     advance = 0.4,
                 },
                 {
+                    tweak = "addactuarian",
+                },
+                {
                     tweak = "addfourier",
                     variant = 1,
                 },
@@ -220,7 +223,8 @@ return {
                             template   = 0x2192,
                             sequence   = {
                                 { glyph = "first", factor = 2 },
-                                { glyph = 0x2022, },
+--                                 { glyph = 0x2022 },
+                                { glyph = 0x2218 },
                                 { glyph = "first", factor = 2 },
                                 { glyph = "last"  },
                             }
diff --git a/tex/context/fonts/mkiv/type-imp-cambria.mkiv b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
index 345778149..c8906df2c 100644
--- a/tex/context/fonts/mkiv/type-imp-cambria.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
@@ -49,23 +49,23 @@
 
     \starttypescript [\s!math] [cambria,cambria-m,cambria-a] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=cambria-math]
-        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math]
     \stoptypescript
     \starttypescript [\s!math] [cambria-nt] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math\mathsizesuffix,mathextra}]
-        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,mathextra}]
+        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra}]
     \stoptypescript
     \starttypescript [\s!math] [cambria-x] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math,mathextra},\s!goodies=cambria-math]
-        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math,cambria-math-bold,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math,cambria:mathextra,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math]
     \stoptypescript
     \starttypescript [\s!math] [cambria-y] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,mathextra},\s!goodies=cambria-math]
-        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria-math-bold,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman]     [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria:mathextra,mathextra},\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRomanBold] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,cambria-math-bold,cambria:mathextra,mathextra},\s!goodies=cambria-math]
     \stoptypescript
 
     \starttypescript [\s!serif] [cambria,cambria-m,cambria-a,cambria-nt] [\s!name]
diff --git a/tex/context/fonts/mkiv/type-imp-concrete.mkiv b/tex/context/fonts/mkiv/type-imp-concrete.mkiv
index 0ecee3e8b..ff4033f81 100644
--- a/tex/context/fonts/mkiv/type-imp-concrete.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-concrete.mkiv
@@ -20,6 +20,8 @@
     %\definefontfeature[default-slanted-concrete][default][slant=.2]
     %\definefontfeature[none-slanted-concrete]   [none]   [slant=.2]
 
+    \doifunknownfontfeature {concrete-math-bold} {\definefontfeature[concrete-math-bold][boldened]}
+
     \starttypescript [\s!serif] [concrete]
         \definefontsynonym [\s!Serif]            [\s!file:cmunorm] [\s!features=\s!default]
         \definefontsynonym [\s!SerifItalic]      [\s!file:cmunoti] [\s!features=\s!default]
@@ -54,12 +56,14 @@
 
     \starttypescript [\s!math] [concrete] [\s!name]
         \loadfontgoodies[concrete-math]
-        \definefontsynonym[\s!MathRoman] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,mathextra,concrete:mathextra},\s!goodies=concrete-math]
+        \definefontsynonym[\s!MathRoman]     [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete:mathextra,mathextra},\s!goodies=concrete-math]
+        \definefontsynonym[\s!MathRomanBold] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete-math-bold,concrete:mathextra,mathextra},\s!goodies=concrete-math]
     \stoptypescript
 
     \starttypescript [\s!math] [concrete-nt] [\s!name]
         \loadfontgoodies[concrete-math]
-        \definefontsynonym[\s!MathRoman] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,mathextra,concrete:mathextra}]
+        \definefontsynonym[\s!MathRoman]     [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete:mathextra,mathextra}]
+        \definefontsynonym[\s!MathRomanBold] [\s!file:Concrete-Math.otf] [\s!features={\s!math\mathsizesuffix,concrete-math-bold,concrete:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [concrete,concrete-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
index 1785eacc7..3be50a2de 100644
--- a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
@@ -56,6 +56,8 @@
 
 \starttypescriptcollection[ebgaramond]
 
+    \doifunknownfontfeature {ebgaramond-math-bold} {\definefontfeature[ebgaramond-math-bold][boldened]}
+
     \starttypescript [\s!serif] [ebgaramond]
         \setups[font:fallback:serif]
         \definefontsynonym [\s!Serif]          [\s!file:ebgaramond-regular]   [\s!features=eb-garamond-normal]
@@ -71,11 +73,13 @@
     \stoptypescript
 
     \starttypescript [\s!math] [ebgaramond] [\s!name]
-        \definefontsynonym [\s!MathRoman] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=ebgaramond-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond:mathextra,mathextra},\s!goodies=ebgaramond-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond-math-bold,ebgaramond:mathextra,mathextra},\s!goodies=ebgaramond-math]
     \stoptypescript
 
     \starttypescript [\s!math] [ebgaramond-nt] [\s!name]
-        \definefontsynonym [\s!MathRoman] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
+        \definefontsynonym [\s!MathRoman]     [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:garamond-math.otf] [\s!features={\s!math\mathsizesuffix,ebgaramond-math-bold,ebgaramond:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript[ebgaramond,ebgaramond-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-erewhon.mkiv b/tex/context/fonts/mkiv/type-imp-erewhon.mkiv
index 5c705400f..c536caa0e 100644
--- a/tex/context/fonts/mkiv/type-imp-erewhon.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-erewhon.mkiv
@@ -20,6 +20,8 @@
     %\definefontfeature[default-slanted-erewhon][default][slant=.2]
     %\definefontfeature[none-slanted-erewhon]   [none]   [slant=.2]
 
+    \doifunknownfontfeature {erewhon-math-bold} {\definefontfeature[erewhon-math-bold][boldened]}
+
     \starttypescript [\s!serif] [erewhon]
         \definefontsynonym [\s!Serif]           [\s!file:Erewhon-Regular]       [\s!features=\s!default]
         \definefontsynonym [\s!SerifItalic]     [\s!file:Erewhon-Italic]        [\s!features=\s!default]
@@ -49,11 +51,13 @@
     \stoptypescript
 
     \starttypescript [\s!math] [erewhon] [\s!name]
-        \definefontsynonym [\s!MathRoman][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra},\s!goodies=erewhon-math]
+        \definefontsynonym [\s!MathRoman]    [\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra},\s!goodies=erewhon-math]
+        \definefontsynonym [\s!MathRomanBold][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon-math-bold,erewhon:mathextra,mathextra},\s!goodies=erewhon-math]
     \stoptypescript
 
     \starttypescript [\s!math] [erewhon-nt] [\s!name]
-        \definefontsynonym [\s!MathRoman][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRoman]    [\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRomanBold][\s!file:Erewhon-Math.otf][\s!features={\s!math\mathsizesuffix,erewhon-math-bold,erewhon:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [erewhon,erewhon-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
index 7f819fe3c..472619cd9 100644
--- a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
@@ -17,6 +17,11 @@
 
     \doifunknownfontfeature {kp-sans-bold} {\definefontfeature[kp-sans-bold][boldened-15]}
 
+    \starttypescript [\s!math] [kpfonts,kpfonts-nt,kpfonts-bold,kpfonts-light,kpfonts-sans]
+        \checkedmapfontsize[\typescripttwo][\s!script]      [.70]
+        \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55]
+    \stoptypescript
+
     \starttypescript [kpfonts,kpfonts-light,kpfonts-bold,kpfonts-sans,kpfonts-nt]
         \loadfontgoodies[kpfonts-math]
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] [\s!features=\s!default]
@@ -37,67 +42,62 @@
         \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic]
     \stoptypescript
 
+    \starttypescript [\s!math] [kpfonts]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf]  [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+    \stoptypescript
+
+    \starttypescript [\s!math] [kpfonts-nt]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf]  [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra}]
+    \stoptypescript
+
     \starttypescript [\s!serif] [kpfonts-light]
         \definefontsynonym [\s!Serif]            [\s!file:KpRoman-Light.otf]
-        \definefontsynonym [\s!SerifBold]        [\s!file:KpRoman-Semibold.otf]
+        \definefontsynonym [\s!SerifBold]        [\s!file:KpRoman-Regular.otf]
         \definefontsynonym [\s!SerifItalic]      [\s!file:KpRoman-LightItalic.otf]
-        \definefontsynonym [\s!SerifBoldItalic]  [\s!file:KpRoman-SemiboldItalic.otf]
+        \definefontsynonym [\s!SerifBoldItalic]  [\s!file:KpRoman-Italic.otf]
         \definefontsynonym [\s!SerifSlanted]     [\s!SerifItalic]
         \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic]
     \stoptypescript
 
-    \starttypescript [\s!serif] [kpfonts-bold]
-        \setups[\s!font:\s!fallback:\s!serif]
-        \definefontsynonym [\s!Serif]            [\s!file:KpRoman-Regular.otf]
-        \definefontsynonym [\s!SerifBold]        [\s!file:KpRoman-Bold.otf]
-        \definefontsynonym [\s!SerifItalic]      [\s!file:KpRoman-Italic.otf]
-        \definefontsynonym [\s!SerifBoldItalic]  [\s!file:KpRoman-BoldItalic.otf]
-    \stoptypescript
-
-    \starttypescript [\s!sans] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt]
-        \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [\s!file:KpSans-Regular.otf]
-        \definefontsynonym [\s!SansBold]        [\s!file:KpSans-Bold.otf]
-        \definefontsynonym [\s!SansItalic]      [\s!file:KpSans-Italic.otf]
-        \definefontsynonym [\s!SansBoldItalic]  [\s!file:KpSans-BoldItalic.otf]
-    \stoptypescript
-
-    \starttypescript [\s!mono] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt]
-        \setups[\s!font:\s!fallback:\s!mono]
-        \definefontsynonym [\s!Mono]            [\s!file:KpMono-Regular.otf]
-        \definefontsynonym [\s!MonoBold]        [\s!file:KpMono-Bold.otf]
-        \definefontsynonym [\s!MonoItalic]      [\s!file:KpMono-Italic.otf]
-        \definefontsynonym [\s!MonoBoldItalic]  [\s!file:KpMono-BoldItalic.otf]
-    \stoptypescript
-
-    \starttypescript [\s!math] [kpfonts,kpfonts-nt,kpfonts-bold,kpfonts-light,kpfonts-sans]
-        \checkedmapfontsize[\typescripttwo][\s!script]      [.70]
-        \checkedmapfontsize[\typescripttwo][\s!scriptscript][.55]
-    \stoptypescript
-
-    \starttypescript [\s!math] [kpfonts]
-        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf]  [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
+    \starttypescript [\s!math] [kpfonts-light]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Light.otf]   [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
     \stoptypescript
 
-    \starttypescript [\s!math] [kpfonts-nt]
-        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf]  [\s!features={\s!math\mathsizesuffix,mathextra}]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Semibold.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
+    \starttypescript [\s!serif] [kpfonts-bold]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [\s!file:KpRoman-Regular.otf]
+        \definefontsynonym [\s!SerifBold]       [\s!file:KpRoman-Bold.otf]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:KpRoman-Italic.otf]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-BoldItalic.otf]
     \stoptypescript
 
     \starttypescript [\s!math] [kpfonts-bold]
-        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf]    [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Bold.otf]    [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
     \stoptypescript
 
-    \starttypescript [\s!math] [kpfonts-light]
-        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Light.otf]   [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
+    \starttypescript [\s!sans] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:KpSans-Regular.otf]
+        \definefontsynonym [\s!SansBold]       [\s!file:KpSans-Bold.otf]
+        \definefontsynonym [\s!SansItalic]     [\s!file:KpSans-Italic.otf]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:KpSans-BoldItalic.otf]
     \stoptypescript
 
     \starttypescript [\s!math] [kpfonts-sans]
-        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=kpfonts-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kp-sans-bold,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:KpMath-Sans.otf] [\s!features={\s!math\mathsizesuffix,kp-sans-bold,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+    \stoptypescript
+
+    \starttypescript [\s!mono] [kpfonts,kpfonts-sans,kpfonts-light,kpfonts-bold,kpfonts-nt]
+        \setups[\s!font:\s!fallback:\s!mono]
+        \definefontsynonym [\s!Mono]           [\s!file:KpMono-Regular.otf]
+        \definefontsynonym [\s!MonoBold]       [\s!file:KpMono-Bold.otf]
+        \definefontsynonym [\s!MonoItalic]     [\s!file:KpMono-Italic.otf]
+        \definefontsynonym [\s!MonoBoldItalic] [\s!file:KpMono-BoldItalic.otf]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
index 6e084c14e..97e3b3493 100644
--- a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
@@ -21,6 +21,8 @@
 
 \starttypescriptcollection[libertinus]
 
+    \doifunknownfontfeature {libertinus-math-bold} {\definefontfeature[libertinus-math-bold][boldened]}
+
     \starttypescript [\s!serif] [libertinus]
         \definefontsynonym [LibertinusSerif-Regular]     [\s!file:libertinusserif-regular]
         \definefontsynonym [LibertinusSerif-Italic]      [\s!file:libertinusserif-italic]
@@ -78,14 +80,14 @@
 
     \starttypescript [\s!math] [libertinus] [\s!name]
         \loadfontgoodies[libertinus-math]
-        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=libertinus-math.lfg]
-        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=libertinus-math.lfg]
+        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus:mathextra,mathextra},\s!goodies=libertinus-math.lfg]
+        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus-math-bold,libertinus:mathextra,mathextra},\s!goodies=libertinus-math.lfg]
     \stoptypescript
 
     \starttypescript [\s!math] [libertinus-nt] [\s!name]
         \loadfontgoodies[libertinus-math]
-        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
-        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
+        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus:mathextra,mathextra}]
+        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,libertinus-math-bold,libertinus:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [libertinus,libertinus-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-lucida.mkiv b/tex/context/fonts/mkiv/type-imp-lucida.mkiv
index ced61dcd2..363b0d223 100644
--- a/tex/context/fonts/mkiv/type-imp-lucida.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lucida.mkiv
@@ -21,6 +21,8 @@
 
 \starttypescriptcollection[lucida-opentype]
 
+    \doifunknownfontfeature {lucida-math-bold} {\definefontfeature[lucida-math-bold][boldened]}
+
     \starttypescript [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt]
         \loadfontgoodies[lucida-opentype-math]
         \definetypeface [\typescriptone] [\s!rm] [\s!serif]       [\typescriptone] [\s!default] [\s!features=\s!default]
@@ -74,13 +76,15 @@
     \stoptypescript
 
     \starttypescript [\s!math] [lucida,lucidaot,lucidadk]
-        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math]
+%         \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math]
     \stoptypescript
 
     \starttypescript [\s!math] [lucidaot-nt,lucida-nt]
-        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra}]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra}]
+        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra}]
+%         \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra}]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [\s!handwriting] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-stix.mkiv b/tex/context/fonts/mkiv/type-imp-stix.mkiv
index 503566318..3ac0b7257 100644
--- a/tex/context/fonts/mkiv/type-imp-stix.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-stix.mkiv
@@ -53,7 +53,7 @@
 
     \starttypescript [\s!math] [stix-nt,stixtwo-nt] [\s!name]
         \definefontsynonym[\s!MathRoman][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwomath,stixtwo:mathextra,mathextra}]
-        \definefontsynonym[\s!MathRoman][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwo-math-bold,stixtwomath,stixtwo:mathextra,mathextra}]
+        \definefontsynonym[\s!MathRomanBold][\s!file:stixtwomath-regular.ttf][\s!features={\s!math\mathsizesuffix,stixtwo-math-bold,stixtwomath,stixtwo:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [\s!serif] [stix,stixtwo,xits] [\s!name]
diff --git a/tex/context/fonts/mkiv/type-imp-xcharter.mkiv b/tex/context/fonts/mkiv/type-imp-xcharter.mkiv
index d27f4bcba..6b6e5fc4e 100644
--- a/tex/context/fonts/mkiv/type-imp-xcharter.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-xcharter.mkiv
@@ -16,6 +16,8 @@
     % \definefontfeature[default-slanted-xcharter][default][slant=.2]
     % \definefontfeature[none-slanted-xcharter]   [none]   [slant=.2]
 
+    \doifunknownfontfeature {xcharter-math-bold} {\definefontfeature[xcharter-math-bold][boldened]}
+
     \starttypescript [\s!serif] [xcharter] [\s!name]
         \definefontsynonym [\s!Serif]           [\s!file:XCharter-Roman]      [\s!features=\s!default]
         \definefontsynonym [\s!SerifItalic]     [\s!file:XCharter-Italic]     [\s!features=\s!default]
@@ -45,11 +47,13 @@
     \stoptypescript
 
     \starttypescript [\s!math] [xcharter][\s!name]
-        \definefontsynonym [\s!MathRoman][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra},\s!goodies=xcharter-math]
+        \definefontsynonym [\s!MathRoman]    [\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra},\s!goodies=xcharter-math]
+        \definefontsynonym [\s!MathRomanBold][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter-math-bold,xcharter:mathextra,mathextra},\s!goodies=xcharter-math]
     \stoptypescript
 
     \starttypescript [\s!math] [xcharter-nt] [\s!name]
-        \definefontsynonym [\s!MathRoman][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRoman]    [\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter:mathextra,mathextra}]
+        \definefontsynonym [\s!MathRomanBold][\s!file:XCharter-Math.otf][\s!features={\s!math\mathsizesuffix,xcharter-math-bold,xcharter:mathextra,mathextra}]
     \stoptypescript
 
     \starttypescript [xcharter,xcharter-nt]
diff --git a/tex/context/fonts/mkiv/xcharter-math.lfg b/tex/context/fonts/mkiv/xcharter-math.lfg
index c9b5a2690..be09720d1 100644
--- a/tex/context/fonts/mkiv/xcharter-math.lfg
+++ b/tex/context/fonts/mkiv/xcharter-math.lfg
@@ -108,6 +108,10 @@ return {
                     tweak = "addequals",
                 },
                 {
+                    tweak = "addfourier",
+                    variant = 2,
+                },
+                {
                     tweak = "setoptions",
                     -- set   = { "ignorekerndimensions" }
                 },