2023-03-20 15:44:00

10 files changed, 249 insertions, 94 deletions

diff --git a/tex/context/fonts/mkiv/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg
index 5bbd2cf6c..2965332e4 100644
--- a/tex/context/fonts/mkiv/antykwa-math.lfg
+++ b/tex/context/fonts/mkiv/antykwa-math.lfg
@@ -3,19 +3,19 @@ local helpers = common.mathematics.helpers
 
 if not fonts.encodings.math["extensible-jmn-private"] then
 
-    local nps = fonts.helpers.newprivateslot
+    local ps = fonts.helpers.privateslot
 
     fonts.encodings.math["extensible-jmn-private"] = {
-        [nps("rule middle piece")]         = 200, -- minusjmn
-        [nps("rule right piece")]          = 201, -- minusrightjmn
-        [nps("rule left piece")]           = 202, -- minusleftjmn
-        [nps("double rule middle piece")]  = 203, -- equaljmn
-        [nps("double rule right piece")]   = 204, -- equalrightjmn
-        [nps("double rule left piece")]    = 205, -- equalleftjmn
-        [nps("arrow left piece")]          = 206, -- arrowleftjmn
-        [nps("arrow right piece")]         = 207, -- arrowrightjmn
-        [nps("double arrow left piece")]   = 208, -- arrowdblleftjmn
-        [nps("double arrow right piece")]  = 209, -- arrowdblrightjmn
+        [ps("rule middle piece")]        = 200, -- minusjmn
+        [ps("rule right piece")]         = 201, -- minusrightjmn
+        [ps("rule left piece")]          = 202, -- minusleftjmn
+        [ps("double rule middle piece")] = 203, -- equaljmn
+        [ps("double rule right piece")]  = 204, -- equalrightjmn
+        [ps("double rule left piece")]   = 205, -- equalleftjmn
+        [ps("arrow left piece")]         = 206, -- arrowleftjmn
+        [ps("arrow right piece")]        = 207, -- arrowrightjmn
+        [ps("double arrow left piece")]  = 208, -- arrowdblleftjmn
+        [ps("double arrow right piece")] = 209, -- arrowdblrightjmn
     }
 
 end
diff --git a/tex/context/fonts/mkiv/common-math-jmn.lfg b/tex/context/fonts/mkiv/common-math-jmn.lfg
index 331d65a5d..bcbe77962 100644
--- a/tex/context/fonts/mkiv/common-math-jmn.lfg
+++ b/tex/context/fonts/mkiv/common-math-jmn.lfg
@@ -8,6 +8,10 @@ return {
         helpers = {
             addmissing = function(main)
 
+                local max            = math.max
+                local copytable      = table.copy
+                local slotcommand    = fonts.helpers.commands.slot
+
                 local builders       = fonts.handlers.vf.math.builders
                 local ps             = fonts.helpers.privateslot
 
@@ -25,8 +29,8 @@ return {
                 local llbracepiece = ps("ll brace piece")
                 local lrbracepiece = ps("lr brace piece")
 
-                builders.brace(main,0x23DE,ulbracepiece,cmbracepiece,lrbracepiece,llbracepiece,cmbracepiece,urbracepiece)
-                builders.brace(main,0x23DF,llbracepiece,cmbracepiece,urbracepiece,ulbracepiece,cmbracepiece,lrbracepiece)
+                builders.brace(main,0x23DE,ulbracepiece,cmbracepiece,lrbracepiece,llbracepiece,cmbracepiece,urbracepiece,"top")
+                builders.brace(main,0x23DF,llbracepiece,cmbracepiece,urbracepiece,ulbracepiece,cmbracepiece,lrbracepiece,"bottom")
 
                 builders.parent(main,0x23DC,ulbracepiece,umbracepiece,urbracepiece,"top")
                 builders.parent(main,0x23DD,llbracepiece,lmbracepiece,lrbracepiece,"bottom")
@@ -39,13 +43,21 @@ return {
 
                 builders.jointwo(main,0x21A6,ps("maps to piece"),.15,0x02192) -- \mapstochar\rightarrow
 
+                local srl = ps("rule left piece")
                 local srm = ps("rule middle piece")
                 local srr = ps("rule right piece")
-                local srl = ps("rule left piece")
 
+                local drl = ps("double rule left piece")
                 local drm = ps("double rule middle piece")
                 local drr = ps("double rule right piece")
-                local drl = ps("double rule left piece")
+
+                local sfl = ps("flat rule left piece")
+                local sfm = ps("flat rule middle piece")
+                local sfr = ps("flat rule right piece")
+
+                local dfl = ps("flat double rule left piece")
+                local dfm = ps("flat double rule middle piece")
+                local dfr = ps("flat double rule right piece")
 
                 local sal = ps("arrow left piece")
                 local sar = ps("arrow right piece")
@@ -55,32 +67,90 @@ return {
 
                 local rad = ps("radical bar extender")
 
-                if characters[srm] then
+                local antykwa = characters[srm]
+
+                if not antykwa then
 
-                    builders.jointwo(main,0x27F5,sak,joinrelfactor,srr)
-                    builders.jointwo(main,0x27F6,srl,joinrelfactor,sar)
-                    builders.jointwo(main,0x27F7,sak,joinrelfactor,sar)
-                    builders.jointwo(main,0x27F8,dal,joinrelfactor,drr)
-                    builders.jointwo(main,0x27F9,drl,joinrelfactor,dar)
-                    builders.jointwo(main,0x27FA,dal,joinrelfactor,dar)
+                    sal = 0x02190  sar = 0x02192
+                    dal = 0x021D0  dar = 0x021D2
 
+                    srl = 0x0002D  srr = 0x0002D
+                    drl = 0x0003D  drr = 0x0003D
+
+                    sfl = 0x0002D  srm = 0x0002D
+                    dfl = 0x0003D  drm = 0x0003D
+
+                end
+
+                if not characters[sfm] then
+
+                    local csal = characters[sal]  local sheight = csal.height  local sdepth = csal.depth
+                    local cdal = characters[dal]  local dheight = cdal.height  local ddepth = cdal.depth
+
+                    local csfl = copytable(characters[srl])  characters[sfl] = csfl  csfl.height = sheight  csfl.depth = sdepth csfl.italic = nil
+                    local csfm = copytable(characters[srm])  characters[sfm] = csfm  csfm.height = sheight  csfm.depth = sdepth csfm.italic = nil
+                    local csfr = copytable(characters[srr])  characters[sfr] = csfr  csfr.height = sheight  csfr.depth = sdepth csfr.italic = nil
+                    local cdfl = copytable(characters[drl])  characters[dfl] = cdfl  cdfl.height = dheight  cdfl.depth = ddepth cdfl.italic = nil
+                    local cdfm = copytable(characters[drm])  characters[dfm] = cdfm  cdfm.height = dheight  cdfm.depth = ddepth cdfm.italic = nil
+                    local cdfr = copytable(characters[drr])  characters[dfr] = cdfr  cdfr.height = dheight  cdfr.depth = ddepth cdfr.italic = nil
+
+                end
+
+                builders.jointwo(main,0x27F5,sal,joinrelfactor,srr)
+                builders.jointwo(main,0x27F6,srl,joinrelfactor,sar)
+                builders.jointwo(main,0x27F7,sal,joinrelfactor,sar)
+                builders.jointwo(main,0x27F8,dal,joinrelfactor,drr)
+                builders.jointwo(main,0x27F9,drl,joinrelfactor,dar)
+                builders.jointwo(main,0x27FA,dal,joinrelfactor,dar)
+
+                if antykwa then
                     builders.horibar(main,0x203E,srm,srl,srr,0x02212) -- overbar underbar fraction (we take 90/91/92 too!)
                  -- builders.horibar(main,0x203E,srm,srl,srr,0x0002D) -- overbar underbar fraction (we take 90/91/92 too!)
+                    builders.rootbar(main,rad,srm,srr,0x02212) -- radical
+                else
+                    builders.horibar(main,0x203E,0xFE073) -- overbar underbar
+                end
 
-                    builders.rootbar(main,ps("radical bar extender"),srm,srr,0x02212) -- radical
+                local ffactor = antykwa and 1 or 1
+                local mfactor = antykwa and 1 or .8
+                local lfactor = antykwa and 1 or .8
 
-                else
+                builders.extension(main,0x2190,sal,sfm,sfr,ffactor,mfactor,lfactor) -- \leftarrow
+                builders.extension(main,0x2192,sfl,sfm,sar,ffactor,mfactor,lfactor) -- \rightarrow
+                builders.extension(main,0x27F5,sal,sfm,sfr,ffactor,mfactor,lfactor)
+                builders.extension(main,0x27F6,sfl,sfm,sar,ffactor,mfactor,lfactor)
+                builders.extension(main,0x27F7,sal,sfm,sar,ffactor,mfactor,lfactor)
+                builders.extension(main,0x27F8,dal,dfm,dfr,ffactor,mfactor,lfactor)
+                builders.extension(main,0x27F9,dfl,dfm,dar,ffactor,mfactor,lfactor)
+                builders.extension(main,0x27FA,dal,dfm,dar,ffactor,mfactor,lfactor)
 
-                    builders.jointwo(main,0x27F5,0x02190,joinrelfactor,0x0002D) -- \leftarrow\joinrel\relbar
-                    builders.jointwo(main,0x27F6,0x0002D,joinrelfactor,0x02192) -- \relbar\joinrel\rightarrow
-                    builders.jointwo(main,0x27F7,0x02190,joinrelfactor,0x02192) -- \leftarrow\joinrel\rightarrow
-                    builders.jointwo(main,0x27F8,0x021D0,joinrelfactor,0x0003D) -- \Leftarrow\joinrel\Relbar
-                    builders.jointwo(main,0x27F9,0x0003D,joinrelfactor,0x021D2) -- \Relbar\joinrel\Rightarrow
-                    builders.jointwo(main,0x27FA,0x021D0,joinrelfactor,0x021D2) -- \Leftarrow\joinrel\Rightarrow
+                local tfactor = antykwa and -0.8 or -0.8
+                local bfactor = antykwa and  0.1  or  0.1
 
-                    builders.horibar(main,0x203E,0xFE073) -- overbar underbar
+                local left  = characters[0x27F5]
+                local right = characters[0x27F6]
+                local both  = characters[0x27F7]
 
-                end
+                local height = max(left.height or 0,right.height or 0,both.height or 0)
+                local depth  = max(left.depth  or 0,right.depth  or 0,both.depth  or 0)
+
+                left .height = height  left .depth = depth
+                right.height = height  right.depth = depth
+                both .height = height  both .depth = depth
+
+                local t = copytable(left)  characters[0x20D6] = t t.inneryoffset = tfactor*height t.innerlocation = "top"    t.next = nil t.italic = nil -- over
+                local t = copytable(right) characters[0x20D7] = t t.inneryoffset = tfactor*height t.innerlocation = "top"    t.next = nil t.italic = nil
+                local t = copytable(both)  characters[0x20E1] = t t.inneryoffset = tfactor*height t.innerlocation = "top"    t.next = nil t.italic = nil
+
+                local t = copytable(left)  characters[0x20EE] = t t.inneryoffset = bfactor*height t.innerlocation = "bottom" t.next = nil t.italic = nil -- under
+                local t = copytable(right) characters[0x20EF] = t t.inneryoffset = bfactor*height t.innerlocation = "bottom" t.next = nil t.italic = nil
+                local t = copytable(both)  characters[0x034D] = t t.inneryoffset = bfactor*height t.innerlocation = "bottom" t.next = nil t.italic = nil
+
+                local tfactor = antykwa and -15 or -15
+                local bfactor = antykwa and   1 or   1
+
+                local t = copytable(characters[0x203E]) characters[0x0305] = t t.inneryoffset = tfactor*t.height t.innerlocation = "top"    t.next = nil t.italic = nil
+                local t = copytable(characters[0x203E]) characters[0x0332] = t t.inneryoffset = bfactor*t.height t.innerlocation = "bottom" t.next = nil t.italic = nil
 
                 builders.jointwo(main,0x2016,0x007C,0.20,0x007C)
                 builders.jointwo(main,0x2980,0x007C,0.20,0x007C,0.20,0x007C)
@@ -105,7 +175,9 @@ return {
                 builders.overlaytwo(main,0x2285,0x00338,notshiftfactor,0x02283) -- \not\supset
                 builders.overlaytwo(main,0x2209,0x00338,notshiftfactor,0x02208) -- \not\in
 
-                builders.jointwo(main,0x2254,0x03A,0,0x03D) -- := (≔)
+                -- builders.jointwo  (main,0x2254,0x03A,0,0x03D)         -- :=
+                -- builders.jointhree(main,0x2A74,0x03A,0,0x03A,0,0x03D) -- ::=
+                -- builders.jointwo  (main,0x2A75,0x03D,0,0x03D)         -- ==
 
                 builders.repeated(main,0x222B,0x222B,1,1/2)
                 builders.repeated(main,0x222C,0x222B,2,1/2)
@@ -113,6 +185,11 @@ return {
 
                 characters[0x02B9] = characters[0x2032] -- we're nice
 
+                -- some things are done automatically:
+
+                -- add primes
+                -- add equals and alike
+
             end
         }
     }
diff --git a/tex/context/fonts/mkiv/ebgaramond-math.lfg b/tex/context/fonts/mkiv/ebgaramond-math.lfg
index 812430525..f6f552dfe 100644
--- a/tex/context/fonts/mkiv/ebgaramond-math.lfg
+++ b/tex/context/fonts/mkiv/ebgaramond-math.lfg
@@ -12,8 +12,8 @@ return {
             FractionRuleThickness             =  60,
             OverbarRuleThickness              =  60,
             UnderbarRuleThickness             =  60,
-            AccentTopShiftUp                  = -75,
-            FlattenedAccentTopShiftUp         = -75,
+            AccentTopShiftUp                  = -25, -- was 075
+            FlattenedAccentTopShiftUp         = -25, -- was 075
             AccentBaseDepth                   =  75,
             DelimiterPercent                  =  90,
             DelimiterShortfall                = 400,
@@ -82,9 +82,9 @@ return {
                         [0x27EB]                = { topright = -0.1,  bottomright = -0.1  },
                         ["0x27EB.variants.*"]   = { topright = -0.2,  bottomright = -0.2  },
 
-                        [0x51]                  = { bottomright = 0.25 }, -- Upright Q
-                        [0x211A]                = { bottomright = 0.2 }, -- Blackboard bold Q
-                        [0x1D410]               = { bottomright = 0.2 }, -- Bold Q
+                        [0x00051]               = { bottomright = 0.25 }, -- Upright Q
+                        [0x0211A]               = { bottomright = 0.2  }, -- Blackboard bold Q
+                        [0x1D410]               = { bottomright = 0.2  }, -- Bold Q
                         [0x1D478]               = { bottomright = 0.05 }, -- Bold Q
                         [0x1D5B0]               = { bottomright = 0.05 }, -- Sans Q
                     },
@@ -173,6 +173,24 @@ return {
                     tweak = "addrules",
                 },
                 {
+                    tweak    = "replacerules",
+                    fraction = {
+                        template = "minus", -- 0x2212,
+                        xoffset  = 0.075,
+                        yoffset  = 0.9,
+                     -- width    = 0.85,
+                     -- height   = 0.1,
+                    },
+                    radical = {
+                        template = "minus", -- 0x2212,
+                        xoffset  = 0.075,
+                        yoffset  = 0.9,
+                        yscale   = 0.975,
+                     -- width    = 0.85,
+                     -- height   = 0.1,
+                    },
+                },
+                {
                     tweak   = "addbars",
                     advance = 0.6,
                 },
diff --git a/tex/context/fonts/mkiv/lucida-math.lfg b/tex/context/fonts/mkiv/lucida-math.lfg
index 64f53dc33..28510ac2d 100644
--- a/tex/context/fonts/mkiv/lucida-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-math.lfg
@@ -14,7 +14,7 @@ return {
     mathematics = {
         parameters = {
             FractionRuleThickness             =  55,
-            AccentBaseDepth                   = 250,
+         -- AccentBaseDepth                   = 250,
             DelimiterPercent                  =  90,
             DelimiterShortfall                = 400,
             SuperscriptBottomMaxWithSubscript = 325,
@@ -32,18 +32,18 @@ return {
                     tweak   = "fixoldschool",
                     version = "Version 1.802",
                 },
-{
-    tweak   = "parameters",
-    feature = "boldmath",
-    list    = {
---             RadicalRuleThickness  = 55,
-            RadicalRuleThickness  = 60,
---             RadicalRuleThickness  = "1.09*RadicalRuleThickness",
---             FractionRuleThickness = 65,
---             OverRuleThickness     = 65,
---             UnderRuleThickness    = 65,
-    }
-},
+                {
+                    tweak   = "parameters",
+                    feature = "boldmath",
+                    list    = {
+                --             RadicalRuleThickness  = 55,
+                            RadicalRuleThickness  = 60,
+                --             RadicalRuleThickness  = "1.09*RadicalRuleThickness",
+                --             FractionRuleThickness = 65,
+                --             OverRuleThickness     = 65,
+                --             UnderRuleThickness    = 65,
+                    }
+                },
                 {
                     tweak = "addmirrors",
                 },
@@ -59,6 +59,22 @@ return {
                 presets.moveintegrals        { factor = 1.5 },
                 presets.wipeitalics          { },
                 {
+                    tweak    = "replacealphabets",
+                    filename = "lucidabrightot.otf",
+                    keep     = true,
+                    list     = {
+                        { source = "latinsupplement" },
+                --         { source = "latinextendeda" },
+                --         { source = "latinextendedadditional" },
+                --         { source = "latinextendedb" },
+                --         { source = "latinextendedc" },
+                --         { source = "latinextendedd" },
+                --         { source = "latinextendede" },
+                --         { source = "latinextendedf" },
+                --         { source = "latinextendedg" },
+                    },
+                },
+                {
                     tweak   = "replacealphabets",
                     list    = {
                         {
@@ -140,12 +156,12 @@ return {
                     tweak = "kerns",
                     list  = {
                         [0x002F]                = { topleft  = -0.2,  bottomright = -0.2  },
-                        ["0x7D.parts.top"]      = { topright = -0.15                      }, -- right brace top
-                        ["0x7D.parts.bottom"]   = {                   bottomright = -0.15 }, -- right brace bottom
-                        ["0x7D.variants.*"]     = { topright = -0.15, bottomright = -0.15 }, -- right brace variants
-                        ["0x29.parts.top"]      = { topright = -0.25                      }, -- right parenthesis top
-                        ["0x29.parts.bottom"]   = {                   bottomright = -0.25 }, -- right parenthesis bottom
-                        ["0x29.variants.*"]     = { topright = -0.2,  bottomright = -0.2  }, -- right parenthesis variants
+                        ["0x007D.parts.top"]    = { topright = -0.15                      }, -- right brace top
+                        ["0x007D.parts.bottom"] = {                   bottomright = -0.15 }, -- right brace bottom
+                        ["0x007D.variants.*"]   = { topright = -0.15, bottomright = -0.15 }, -- right brace variants
+                        ["0x0029.parts.top"]    = { topright = -0.25                      }, -- right parenthesis top
+                        ["0x0029.parts.bottom"] = {                   bottomright = -0.25 }, -- right parenthesis bottom
+                        ["0x0029.variants.*"]   = { topright = -0.2,  bottomright = -0.2  }, -- right parenthesis variants
                         ["0x221A.parts.top"]    = { topright = 0.2                        }, -- right radical top
                         ["0x221A.parts.bottom"] = {                   bottomright =  0.2  }, -- right radical bottom
                         ["0x221A.variants.*"]   = { topright = 0.2,   bottomright =  0.2  }, -- right radical variants
@@ -196,6 +212,12 @@ return {
                         [0x21A0] = false,
                     }
                 },
+                -- fix a bug (todo: version)
+                {
+                    tweak       = "sortvariants",
+                    list        = { 0x23DE },
+                    orientation = "horizontal",
+                },
                 -- this is the mkiv section
                 {
                     tweak   = "emulatelmtx",
diff --git a/tex/context/fonts/mkiv/type-imp-concrete.mkiv b/tex/context/fonts/mkiv/type-imp-concrete.mkiv
index ff4033f81..abf9b2cb1 100644
--- a/tex/context/fonts/mkiv/type-imp-concrete.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-concrete.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=type-imp-erewhon,
+%D   [       file=type-imp-concrete,
 %D        version=2022.30.09, % a bit older
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=\TEX Gyre Fonts,
@@ -11,9 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%\loadtypescriptfile[texgyre]
-%\resetfontfallback  [concrete-euler-fix]
-%\definefontfallback[concrete-euler-fix][texgyrepagella-math] [0x022EE,0x022F0,0x022F1,0x02661,0x02220][force=yes]
+% lm is already preloaded so we can actually move this to lm
 
 \starttypescriptcollection[concrete]
 
@@ -21,33 +19,35 @@
     %\definefontfeature[none-slanted-concrete]   [none]   [slant=.2]
 
     \doifunknownfontfeature {concrete-math-bold} {\definefontfeature[concrete-math-bold][boldened]}
+    \doifunknownfontfeature {concrete-text-bold} {\definefontfeature[concrete-text-bold][boldened-15]}
 
     \starttypescript [\s!serif] [concrete]
-        \definefontsynonym [\s!Serif]            [\s!file:cmunorm] [\s!features=\s!default]
-        \definefontsynonym [\s!SerifItalic]      [\s!file:cmunoti] [\s!features=\s!default]
-        \definefontsynonym [\s!SerifSlanted]     [\s!file:cmunorm] [\s!features=default-slanted-concrete]
-        \definefontsynonym [\s!SerifBold]        [\s!file:cmunobx] [\s!features=\s!default]
-        \definefontsynonym [\s!SerifBoldItalic]  [\s!file:cmunobi] [\s!features=\s!default]
-        \definefontsynonym [\s!SerifBoldSlanted] [\s!file:cmunobx] [\s!features=default-slanted-concrete]
+        \definefontsynonym [\s!Serif]            [LMTypewriterVarWd-Regular]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SerifBold]        [LMTypewriterVarWd-Dark]        [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SerifItalic]      [LMTypewriterVarWd-Oblique]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SerifSlanted]     [LMTypewriterVarWd-Oblique]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SerifBoldItalic]  [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SerifBoldSlanted] [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}]
     \stoptypescript
 
     \starttypescript [\s!sans] [concrete]
-        \definefontsynonym [\s!Sans]            [\s!file:cmunss] [\s!features=\s!default]
-        \definefontsynonym [\s!SansItalic]      [\s!file:cmunsi] [\s!features=\s!default]
-        \definefontsynonym [\s!SansSlanted]     [\s!file:cmunss] [\s!features=default-slanted-concrete]
-        \definefontsynonym [\s!SansBold]        [\s!file:cmunsx] [\s!features=\s!default]
-        \definefontsynonym [\s!SansBoldItalic]  [\s!file:cmunso] [\s!features=\s!default]
-        \definefontsynonym [\s!SansBoldSlanted] [\s!file:cmunsx] [\s!features=default-slanted-concrete]
+        \definefontsynonym [\s!Sans]            [LMTypewriterVarWd-Regular]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SansItalic]      [LMTypewriterVarWd-Dark]        [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SansSlanted]     [LMTypewriterVarWd-Oblique]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SansBold]        [LMTypewriterVarWd-Oblique]     [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SansBoldItalic]  [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}]
+        \definefontsynonym [\s!SansBoldSlanted] [LMTypewriterVarWd-DarkOblique] [\s!features={\s!default,concrete-text-bold}]
     \stoptypescript
 
     \starttypescript [\s!mono] [concrete]
-        \definefontsynonym [\s!Mono]            [\s!file:cmuntt] [\s!features=\s!none]
-        \definefontsynonym [\s!MonoItalic]      [\s!file:cmunit] [\s!features=\s!none]
-        \definefontsynonym [\s!MonoSlanted]     [\s!file:cmunst] [\s!features=\s!none]
-        \definefontsynonym [\s!MonoBold]        [\s!file:cmuntb] [\s!features=\s!none]
-        \definefontsynonym [\s!MonoBoldItalic]  [\s!file:cmuntx] [\s!features=\s!none]
-        \definefontsynonym [\s!MonoBoldSlanted] [\s!file:cmuntb] [\s!features=none-slanted-concrete]
-    \stoptypescript
+        \loadfontgoodies[lm]
+        \definefontsynonym [\s!Mono]            [LMTypewriter-Regular]     [\s!features={\s!none,concrete-text-bold}]
+        \definefontsynonym [\s!MonoBold]        [LMTypewriter-Dark]        [\s!features={\s!none,concrete-text-bold}]
+        \definefontsynonym [\s!MonoItalic]      [LMTypewriter-Italic]      [\s!features={\s!none,concrete-text-bold}]
+        \definefontsynonym [\s!MonoSlanted]     [LMTypewriter-Oblique]     [\s!features={\s!none,concrete-text-bold}]
+        \definefontsynonym [\s!MonoBoldItalic]  [LMTypewriter-DarkOblique] [\s!features={\s!none,concrete-text-bold}]
+        \definefontsynonym [\s!MonoBoldSlanted] [LMTypewriter-DarkOblique] [\s!features={\s!none,concrete-text-bold}]
+   \stoptypescript
 
     \starttypescript [\s!math] [concrete]
         \checkedmapfontsize[\typescripttwo][\s!script]      [.76]
diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
index 31026df5b..966e50ba8 100644
--- a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
@@ -65,6 +65,14 @@
 
 \starttypescriptcollection[ebgaramond]
 
+    \startsetups[ebgaramond]
+        \letmathfractionparameter\c!rule\v!symbol
+        \setmathfractionparameter\c!middle{"203E}%
+        \letmathradicalparameter \c!rule\v!symbol
+        \setmathradicalparameter \c!top{\radicalbarextenderuc}%
+      % \setmathfenceparameter   \c!alternative{1}%
+    \stopsetups
+
     \doifunknownfontfeature {ebgaramond-math-bold} {\definefontfeature[ebgaramond-math-bold][boldened]}
 
     \starttypescript [\s!serif] [ebgaramond]
@@ -76,15 +84,13 @@
         \definefontsynonym [\s!SerifCaps]      [\s!Serif]                     [\s!features=eb-garamond-smallcaps]
     \stoptypescript
 
-
-
-     \starttypescript [\s!sans] [ysabeau]
-         % \setups[font:fallback:sans]
-         \definefontsynonym [\s!Sans]          [\s!file:ysabeau-regular]       [\s!features=\s!default]
-         \definefontsynonym [\s!SansItalic]    [\s!file:ysabeau-italic]        [\s!features=\s!default]
-         \definefontsynonym [\s!SansBold]      [\s!file:ysabeau-bold]          [\s!features=\s!default]
-         \definefontsynonym [\s!SansBoldItalic][\s!file:ysabeau-bolditalic]    [\s!features=\s!default]
-         \definefontsynonym [\s!SansCaps]      [\s!Sans]                       [\s!features=ysabeau-smallcaps]
+    \starttypescript [\s!sans] [ysabeau]
+        % \setups[font:fallback:sans]
+        \definefontsynonym [\s!Sans]          [\s!file:ysabeau-regular]       [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]    [\s!file:ysabeau-italic]        [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]      [\s!file:ysabeau-bold]          [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic][\s!file:ysabeau-bolditalic]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansCaps]      [\s!Sans]                       [\s!features=ysabeau-smallcaps]
      \stoptypescript
 
     \starttypescript [\s!math] [ebgaramond,ebgaramond-nt]
diff --git a/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
index f43731250..528cb3208 100644
--- a/tex/context/fonts/mkiv/type-imp-iwona.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
@@ -66,12 +66,15 @@
 
     \starttypescript [\s!math][iwona][\s!all]
         \definefontsynonym[\s!MathRoman]    [iwonamath@iwona-math]
+        \definefontsynonym[\s!MathRomanBold][iwonamediummath@iwona-medium-math]
     \stoptypescript
     \starttypescript [\s!math][iwona-light][\s!all]
         \definefontsynonym[\s!MathRoman]    [iwonalightmath@iwona-light-math]
+        \definefontsynonym[\s!MathRomanBold][iwonamath@kurier-medium-math]
     \stoptypescript
     \starttypescript [\s!math][iwona-medium][\s!all]
         \definefontsynonym[\s!MathRoman]    [iwonamediummath@iwona-medium-math]
+        \definefontsynonym[\s!MathRomanBold][kurierheavymath@kurier-heavy-math]
     \stoptypescript
     \starttypescript [\s!math][iwona-heavy][\s!all]
         \definefontsynonym[\s!MathRoman][iwonaheavymath@iwona-heavy-math]
diff --git a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
index 472619cd9..c8e92d20b 100644
--- a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv
@@ -68,14 +68,14 @@
 
     \starttypescript [\s!serif] [kpfonts-bold]
         \setups[\s!font:\s!fallback:\s!serif]
-        \definefontsynonym [\s!Serif]           [\s!file:KpRoman-Regular.otf]
+        \definefontsynonym [\s!Serif]           [\s!file:KpRoman-SemiBold.otf]
         \definefontsynonym [\s!SerifBold]       [\s!file:KpRoman-Bold.otf]
-        \definefontsynonym [\s!SerifItalic]     [\s!file:KpRoman-Italic.otf]
+        \definefontsynonym [\s!SerifItalic]     [\s!file:KpRoman-SemiboldItalic.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,kpfonts:mathextra,mathextra},\s!goodies=kpfonts-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:KpMath-SemiBold.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
 
diff --git a/tex/context/fonts/mkiv/type-imp-kurier.mkiv b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
index 0bf1a43ca..af1e2a28d 100644
--- a/tex/context/fonts/mkiv/type-imp-kurier.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-kurier.mkiv
@@ -13,12 +13,30 @@
 
 \starttypescriptcollection [kurier]
 
+    \startsetups[kurier]
+      % \setupmathfence   [\c!alternative=1]%
+        \setmathfenceparameter   \c!alternative{1}%
+%         \letmathfractionparameter\c!rule\v!symbol
+%         \setmathfractionparameter\c!middle{"203E}%
+%         \letmathradicalparameter \c!rule\v!symbol
+%         \setmathradicalparameter \c!top{\radicalbarextenderuc}%
+%         \setmathfenceparameter   \c!alternative{1}%
+    \stopsetups
+
+    \startsetups[kurier-light]      \directsetup{antykwa}\stopsetups
+    \startsetups[kurier-medium]     \directsetup{antykwa}\stopsetups
+    \startsetups[kurier-heavy]      \directsetup{antykwa}\stopsetups
+    \startsetups[kurier-cond]       \directsetup{antykwa}\stopsetups
+    \startsetups[kurier-light-cond] \directsetup{antykwa}\stopsetups
+    \startsetups[kurier-medium-cond]\directsetup{antykwa}\stopsetups
+    \startsetups[kurier-heavy-cond] \directsetup{antykwa}\stopsetups
+
     \definefontfeature[virtualmath-kurier]       [virtualmath][virtualweight=kurier]
     \definefontfeature[virtualmath-kurier-light] [virtualmath][virtualweight=kurier-light]
     \definefontfeature[virtualmath-kurier-medium][virtualmath][virtualweight=kurier-medium]
     \definefontfeature[virtualmath-kurier-heavy] [virtualmath][virtualweight=kurier-heavy]
 
-    \starttypescript [\s!sans] [kurier-light,kurier,kurier-medium]
+    \starttypescript [\s!sans] [kurier-light,kurier,kurier-medium,kurier-heavy]
         \definefontsynonym [Kurier-Light]        [\s!file:kurierlightregular]  [\s!features=\s!default]
         \definefontsynonym [Kurier-LightItalic]  [\s!file:kurierlightitalic]   [\s!features=\s!default]
         \definefontsynonym [Kurier-Regular]      [\s!file:kurierregular]       [\s!features=\s!default]
@@ -88,6 +106,14 @@
         \definefontsynonym [\s!SansBoldItalic] [Kurier-HeavyItalic]
     \stoptypescript
 
+    \starttypescript [\s!sans] [kurier-heavy] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [Kurier-Heavy]
+        \definefontsynonym [\s!SansItalic]     [Kurier-HeavyItalic]
+        \definefontsynonym [\s!SansBold]       [Kurier-Heavy]
+        \definefontsynonym [\s!SansBoldItalic] [Kurier-Heavy]
+    \stoptypescript
+
     \starttypescript [\s!sans] [kurier-lightcond]
         \setups[\s!font:\s!fallback:\s!sans]
         \definefontsynonym [\s!Sans]           [Kurier-CondLight]
@@ -112,7 +138,7 @@
         \definefontsynonym [\s!SansBoldItalic] [Kurier-CondHeavyItalic]
     \stoptypescript
 
-    \starttypescript [kurier-light,kurier,kurier-medium,kurier-lightcond,kurier-cond,kurier-mediumcond]
+    \starttypescript [kurier-light,kurier,kurier-medium,kurier-heavy,kurier-lightcond,kurier-cond,kurier-mediumcond]
         \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [\typescriptone] [\s!default]
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern]         [\s!default]
         \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default]
diff --git a/tex/context/fonts/mkiv/xcharter-math.lfg b/tex/context/fonts/mkiv/xcharter-math.lfg
index 1ff5d41d8..193c0fd1b 100644
--- a/tex/context/fonts/mkiv/xcharter-math.lfg
+++ b/tex/context/fonts/mkiv/xcharter-math.lfg
@@ -86,6 +86,9 @@ return {
                 {
                     tweak = "addprimed",
                 },
+-- {
+--     tweak = "addarrows",
+-- },
                 {
                     tweak = "addfourier",
                     variant = 2,