2023-02-23 21:26:00

8 files changed, 408 insertions, 233 deletions

diff --git a/tex/context/fonts/mkiv/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg
index 3c34d7af0..5bbd2cf6c 100644
--- a/tex/context/fonts/mkiv/antykwa-math.lfg
+++ b/tex/context/fonts/mkiv/antykwa-math.lfg
@@ -1,35 +1,115 @@
+local common  = fonts.goodies.load("common-math-jmn.lfg")
+local helpers = common.mathematics.helpers
+
+if not fonts.encodings.math["extensible-jmn-private"] then
+
+    local nps = fonts.helpers.newprivateslot
+
+    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
+    }
+
+end
+
+local fraction = .25
+
 local badones = {
-    summationtext       = .25,
-    producttext         = .25,
-    integraltext        = .25,
-    uniontext           = .25,
-    intersectiontext    = .25,
-    unionmultitext      = .25,
-    logicalandtext      = .25,
-    logicalortext       = .25,
-    summationdisplay    = .25,
-    productdisplay      = .25,
-    integraldisplay     = .25,
-    uniondisplay        = .25,
-    intersectiondisplay = .25,
-    unionmultidisplay   = .25,
-    logicalanddisplay   = .25,
-    logicalordisplay    = .25,
-    coproducttext       = .25,
-    coproductdisplay    = .25,
+    summationtext         = fraction,
+    producttext           = fraction,
+    integraltext          = fraction,
+    uniontext             = fraction,
+    intersectiontext      = fraction,
+    unionmultitext        = fraction,
+    logicalandtext        = fraction,
+    logicalortext         = fraction,
+    summationdisplay      = fraction,
+    productdisplay        = fraction,
+    integraldisplay       = fraction,
+    uniondisplay          = fraction,
+    intersectiondisplay   = fraction,
+    unionmultidisplay     = fraction,
+    logicalanddisplay     = fraction,
+    logicalordisplay      = fraction,
+    coproducttext         = fraction,
+    coproductdisplay      = fraction,
+
+    braceleftBig          = fraction,
+    braceleftBigg         = fraction,
+    braceleftbig          = fraction,
+    braceleftbigg         = fraction,
+    parenleftBig          = fraction,
+    parenleftBigg         = fraction,
+    parenleftbig          = fraction,
+    parenleftbigg         = fraction,
+    bracketleftBig        = fraction,
+    bracketleftBigg       = fraction,
+    bracketleftbig        = fraction,
+    bracketleftbigg       = fraction,
+    ceilingleftBig        = fraction,
+    ceilingleftBigg       = fraction,
+    ceilingleftbig        = fraction,
+    ceilingleftbigg       = fraction,
+    floorleftBig          = fraction,
+    floorleftBigg         = fraction,
+    floorleftbig          = fraction,
+    floorleftbigg         = fraction,
+    anglebracketleftBig   = fraction,
+    anglebracketleftBigg  = fraction,
+    anglebracketleftbig   = fraction,
+    anglebracketleftbigg  = fraction,
+
+    bracerightBig         = fraction,
+    bracerightBigg        = fraction,
+    bracerightbig         = fraction,
+    bracerightbigg        = fraction,
+    parenrightBig         = fraction,
+    parenrightBigg        = fraction,
+    parenrightbig         = fraction,
+    parenrightbigg        = fraction,
+    bracketrightBig       = fraction,
+    bracketrightBigg      = fraction,
+    bracketrightbig       = fraction,
+    bracketrightbigg      = fraction,
+    ceilingrightBig       = fraction,
+    ceilingrightBigg      = fraction,
+    ceilingrightbig       = fraction,
+    ceilingrightbigg      = fraction,
+    floorrightBig         = fraction,
+    floorrightBigg        = fraction,
+    floorrightbig         = fraction,
+    floorrightbigg        = fraction,
+    anglebracketrightBig  = fraction,
+    anglebracketrightBigg = fraction,
+    anglebracketrightbig  = fraction,
+    anglebracketrightbigg = fraction,
+
+    backslashBig          = fraction,
+    backslashBigg         = fraction,
+    backslashbig          = fraction,
+    backslashbigg         = fraction,
 }
 
 local uglyones = {
-    braceleft  = true,
-    braceright = true,
+    braceleft     = true,
+    braceright    = true,
+    vextendsingle = true,
+    vextenddouble = true,
 }
 
-
 return {
     name = "antykwa-math",
     version = "1.00",
     comment = "Goodies that complement antykwa math.",
-    author = "Hans, Mojca, Aditya",
+    author = "Hans, Mojca, Aditya, Mikael",
     copyright = "ConTeXt development team",
     mathematics = {
         mapfiles = {
@@ -37,7 +117,10 @@ return {
             "antt-mi.map",
             "antt-sy.map",
             "antt-ex.map",
-            "mkiv-base.map",
+         -- "mkiv-base.map",
+        },
+        variables = {
+            notshiftfactor = 0.075,
         },
         virtuals = {
             ["antykwa-math"] = {
@@ -48,9 +131,10 @@ return {
                 { name = "mi-anttri.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "mi-anttbi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-anttb.tfm",  vector = "tex-bf", skewchar=0x7F },
-                { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones },
+                { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true
+                { name = "sy-anttrz.tfm", vector = "extensible-jmn-private", skewchar=0x30 },
                 { name = "file:AntykwaTorunska-Regular", vector = "tex-ex-braces", backmap = false },
-                { name = "ex-anttr.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-anttr.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["antykwa-light-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-antykwa-light", main = true, parameters = false },
@@ -60,9 +144,10 @@ return {
                 { name = "mi-anttli.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "mi-anttri.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-anttr.tfm",  vector = "tex-bf", skewchar=0x7F },
-                { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones },
+                { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true
+                { name = "sy-anttlz.tfm", vector = "extensible-jmn-private", skewchar=0x30 },
                 { name = "file:AntykwaTorunskaLight-Regular", vector = "tex-ex-braces", backmap = false },
-                { name = "ex-anttl.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-anttl.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyone },
             },
             ["antykwa-cond-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-antykwa-cond", main = true, parameters = false },
@@ -72,9 +157,10 @@ return {
                 { name = "mi-anttcri.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "mi-anttcbi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-anttcb.tfm",  vector = "tex-bf", skewchar=0x7F },
-                { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones },
+                { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true
+                { name = "sy-anttcrz.tfm", vector = "extensible-jmn-private", skewchar=0x30 },
                 { name = "file:AntykwaTorunskaCond-Regular", vector = "tex-ex-braces", backmap = false },
-                { name = "ex-anttcr.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-anttcr.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyone },
             },
             ["antykwa-lightcond-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-antykwa-lightcond", main = true, parameters = false },
@@ -84,10 +170,12 @@ return {
                 { name = "mi-anttcli.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "mi-anttcri.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-anttcr.tfm",  vector = "tex-bf", skewchar=0x7F },
-                { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones },
+                { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true
+                { name = "sy-anttclz.tfm", vector = "extensible-jmn-private", skewchar=0x30 },
                 { name = "file:AntykwaTorunskaCondLight-Regular", vector = "tex-ex-braces", backmap = false },
-                { name = "ex-anttcl.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-anttcl.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyone },
             }
-        }
+        },
+        addmissing = helpers.addmissing,
     }
 }
diff --git a/tex/context/fonts/mkiv/common-math-jmn.lfg b/tex/context/fonts/mkiv/common-math-jmn.lfg
new file mode 100644
index 000000000..331d65a5d
--- /dev/null
+++ b/tex/context/fonts/mkiv/common-math-jmn.lfg
@@ -0,0 +1,119 @@
+return {
+    name = "common-math-jmn",
+    version = "1.00",
+    comment = "Goodies that complement the JMN collection.",
+    author = "Hans, Mikael",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        helpers = {
+            addmissing = function(main)
+
+                local builders       = fonts.handlers.vf.math.builders
+                local ps             = fonts.helpers.privateslot
+
+                local characters     = main.characters
+                local variables      = main.goodies.mathematics and main.goodies.mathematics.variables or { }
+                local joinrelfactor  = variables.joinrelfactor or 3
+                local notshiftfactor = variables.notshiftfactor or 0
+
+                local umbracepiece = ps("um brace piece")
+                local lmbracepiece = ps("lm brace piece")
+                local cmbracepiece = ps("cm brace piece")
+
+                local ulbracepiece = ps("ul brace piece")
+                local urbracepiece = ps("ur brace piece")
+                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.parent(main,0x23DC,ulbracepiece,umbracepiece,urbracepiece,"top")
+                builders.parent(main,0x23DD,llbracepiece,lmbracepiece,lrbracepiece,"bottom")
+
+                builders.dots(main,0x2026) -- ldots
+                builders.dots(main,0x22EE) -- vdots
+                builders.dots(main,0x22EF) -- cdots
+                builders.dots(main,0x22F1) -- ddots
+                builders.dots(main,0x22F0) -- udots
+
+                builders.jointwo(main,0x21A6,ps("maps to piece"),.15,0x02192) -- \mapstochar\rightarrow
+
+                local srm = ps("rule middle piece")
+                local srr = ps("rule right piece")
+                local srl = ps("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 sal = ps("arrow left piece")
+                local sar = ps("arrow right piece")
+
+                local dal = ps("double arrow left piece")
+                local dar = ps("double arrow right piece")
+
+                local rad = ps("radical bar extender")
+
+                if characters[srm] 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)
+
+                    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,ps("radical bar extender"),srm,srr,0x02212) -- radical
+
+                else
+
+                    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
+
+                    builders.horibar(main,0x203E,0xFE073) -- overbar underbar
+
+                end
+
+                builders.jointwo(main,0x2016,0x007C,0.20,0x007C)
+                builders.jointwo(main,0x2980,0x007C,0.20,0x007C,0.20,0x007C)
+
+                characters[0x007C].extensible      = true
+                characters[0x007C].varianttemplate = 0x5B
+                characters[0x2016].extensible      = true
+                characters[0x2016].varianttemplate = 0x5B
+                characters[0x2980].extensible      = true
+                characters[0x2980].varianttemplate = 0x5B
+
+                -- 21CB leftrightharpoon
+                -- 21CC rightleftharpoon
+
+                builders.stack(main,0x2259,0x0003D,3,0x02227) -- \buildrel\wedge\over=
+
+                builders.jointwo(main,0x22C8,0x022B3,joinrelfactor,0x022B2) -- \mathrel\triangleright\joinrel\mathrel\triangleleft (4 looks better than 3)
+                builders.jointwo(main,0x22A7,0x0007C,joinrelfactor,0x0003D) -- \mathrel|\joinrel=
+
+                builders.overlaytwo(main,0x2260,0x00338,notshiftfactor,0x0003D) -- \not\equal
+                builders.overlaytwo(main,0x2284,0x00338,notshiftfactor,0x02282) -- \not\subset
+                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.repeated(main,0x222B,0x222B,1,1/2)
+                builders.repeated(main,0x222C,0x222B,2,1/2)
+                builders.repeated(main,0x222D,0x222B,3,1/2)
+
+                characters[0x02B9] = characters[0x2032] -- we're nice
+
+            end
+        }
+    }
+}
diff --git a/tex/context/fonts/mkiv/ebgaramond.lfg b/tex/context/fonts/mkiv/ebgaramond.lfg
deleted file mode 100644
index 73676ce44..000000000
--- a/tex/context/fonts/mkiv/ebgaramond.lfg
+++ /dev/null
@@ -1,90 +0,0 @@
-return {
-    name = "ebgaramond",
-    version = "1.00",
-    comment = "Goodies that complement ebgaramond.",
-    author = "Hans Hagen & Mikael Sundqvist",
-    copyright = "ConTeXt development team",
-    mathematics = {
-        tweaks = {
-            aftercopying = {
-                {
-                    tweak    = "version",
-                    expected = "Version 2019-08-16",
-                },
-                {
-                    tweak = "dimensions",
-                    list  = {
-                        -- offset width italic
-                        [0x00393] = { 0.05, 1.05, 0.075 }, -- \Gamma
-                     -- [0x003A6] = { 0.05, 1.05, 0     }, -- \Phi difficult!
-                        [0x003A8] = { 0.05, 1.05, 0.075 }, -- \Psi
-                        [0x02113] = { 0,    1,    0.075 }, -- \ell
-                        [0x1D436] = { 0,    1,    0.05  }, -- C
-                        [0x1D43D] = { 0.3,  1.4,  0.1   }, -- J
-                        [0x1D44B] = { 0,    1,    0.05  }, -- X
-                        [0x1D450] = { 0,    1.1,  0     }, -- c
-                        [0x1D451] = { 0,    1,    0.05  }, -- d
-                        [0x1D452] = { 0,    1.1,  0.05  }, -- e
-                        [0x1D453] = { 0.15, 1.15, 0.1   }, -- f
-                        [0x1D454] = { 0.1,  1.2,  0.1   }, -- g
-                        [0xF0276] = { 0,    1.1,  0     }, -- h
-                        [0x1D457] = { 0.2,  1.25, 0.05  }, -- j
-                        [0x1D459] = { 0,    1,    0.05  }, -- l
-                        [0x1D45D] = { 0.15, 1.15, 0     }, -- p
-                        [0x1D45E] = { 0,    1.05, 0     }, -- q
-                        [0x1D45F] = { 0,    1.05, 0     }, -- r
-                        [0x1D461] = { 0,    1,    0.1   }, -- t
-                        [0x1D465] = { 0.05, 1.1,  0.05  }, -- x
-                        [0x1D466] = { 0.2,  1.2,  0     }, -- y
-                        [0x1D6FD] = { 0.05, 1.1,  0.05  }, -- \beta
-                        [0x1D6FE] = { 0,    1.05, 0     }, -- \gamma
-                        [0x1D6FF] = { 0,    1,    0.1   }, -- \delta
-                        [0x1D716] = { 0,    1.1,  0     }, -- \epsilon
-                        [0x1D700] = { 0,    1.1,  0     }, -- \varepsilon
-                        [0x1D701] = { 0,    1,    0.15  }, -- \zeta
-                        [0x1D703] = { 0,    1,    0.1   }, -- \theta
-                        [0x1D705] = { 0,    1,    0.1   }, -- \kappa
-                        [0x1D706] = { 0.05, 1.1,  0     }, -- \lambda
-                        [0x1D707] = { 0.05, 1.05, 0     }, -- \mu
-                        [0x1D708] = { 0,    1.1,  0     }, -- \nu
-                        [0x1D709] = { 0,    1.1,  0     }, -- \xi
-                        [0x1D70B] = { 0,    1.05, 0     }, -- \pi
-                        [0x1D70C] = { 0.2,  1.2,  0     }, -- \rho
-                        [0x1D70E] = { 0,    1,    0.1   }, -- \sigma
-                        [0x1D70F] = { 0.05, 1.05, 0.1   }, -- \tau
-                        [0x1D712] = { 0.15, 1.2,  0.05  }, -- \chi
-                        [0x1D713] = { 0.05, 1.05, 0.05  }, -- \psi
-                    },
-                },
-                {
-                    tweak   = "fixprimes",
-                    scale   = 0.75,
-                    smaller = true,
-                    factor  = 0.8,
-                    fake    = 0.75,
-                },
-                {
-                    tweak = "checkspacing",
-                },
-                {
-                    tweak = "addscripts",
-                },
-            },
-        },
-        alternates = {
-            partial        = { feature = 'ss02', value = 1, comment = "Curved partial" },
-            semibold       = { feature = 'ss04', value = 1, comment = "Semibold" },
-            extrabold      = { feature = 'ss05', value = 1, comment = "Extrabold" },
-            hbar           = { feature = 'ss06', value = 1, comment = "Horizontal bar for h-bar" },
-            integral       = { feature = 'ss07', value = 1, comment = "A more slanted integral sign" },
-            tilde          = { feature = 'ss09', value = 1, comment = "A tilde variant" },
-            outbendingh    = { feature = 'ss10', value = 1, comment = "Out-bending h" },
-            largeoperators = { feature = 'ss11', value = 1, comment = "Larger operators" },
-        },
-        bigslots = {
-            1, 3, 5, 7
-        },
-    },
-}
-
-
diff --git a/tex/context/fonts/mkiv/iwona-math.lfg b/tex/context/fonts/mkiv/iwona-math.lfg
index bc402ea33..815b9e120 100644
--- a/tex/context/fonts/mkiv/iwona-math.lfg
+++ b/tex/context/fonts/mkiv/iwona-math.lfg
@@ -1,3 +1,6 @@
+local common  = fonts.goodies.load("common-math-jmn.lfg")
+local helpers = common.mathematics.helpers
+
 local badones = {
     summationtext       = .25,
     producttext         = .25,
@@ -19,6 +22,13 @@ local badones = {
     coproductdisplay    = .25,
 }
 
+local uglyones = {
+ -- braceleft     = true,
+ -- braceright    = true,
+    vextendsingle = true,
+    vextenddouble = true,
+}
+
 return {
     name = "iwona-math",
     version = "1.00",
@@ -31,7 +41,7 @@ return {
             "iwona-mi.map",
             "iwona-sy.map",
             "iwona-ex.map",
-            "mkiv-base.map",
+         -- "mkiv-base.map",
         },
         virtuals = {
             ["iwona-math"] = {
@@ -43,7 +53,7 @@ return {
                 { name = "mi-iwonami.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-iwonam.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-iwonar.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-iwonar.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["iwona-light-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-iwona-light", main = true, parameters = false },
@@ -54,7 +64,7 @@ return {
                 { name = "mi-iwonari.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-iwonar.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-iwonal.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-iwonal.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["iwona-medium-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-iwona-medium", main = true, parameters = false },
@@ -65,7 +75,7 @@ return {
                 { name = "mi-iwonabi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-iwonab.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-iwonam.tfm",  vector = "tex-ex", extension = true, badones = badones  },
+                { name = "ex-iwonam.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["iwona-heavy-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-iwona-heavy", main = true, parameters = false },
@@ -76,8 +86,9 @@ return {
                 { name = "mi-iwonahi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-iwonah.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-iwonah.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-iwonah.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             }
         },
+        addmissing = helpers.addmissing,
     }
 }
diff --git a/tex/context/fonts/mkiv/kurier-math.lfg b/tex/context/fonts/mkiv/kurier-math.lfg
index bee2e08e4..221992518 100644
--- a/tex/context/fonts/mkiv/kurier-math.lfg
+++ b/tex/context/fonts/mkiv/kurier-math.lfg
@@ -1,3 +1,6 @@
+local common  = fonts.goodies.load("common-math-jmn.lfg")
+local helpers = common.mathematics.helpers
+
 local badones = {
     summationtext       = .25,
     producttext         = .25,
@@ -19,6 +22,13 @@ local badones = {
     coproductdisplay    = .25,
 }
 
+local uglyones = {
+ -- braceleft     = true,
+ -- braceright    = true,
+    vextendsingle = true,
+    vextenddouble = true,
+}
+
 return {
     name = "kurier-math",
     version = "1.00",
@@ -31,7 +41,7 @@ return {
             "kurier-mi.map",
             "kurier-sy.map",
             "kurier-ex.map",
-            "mkiv-base.map",
+         -- "mkiv-base.map",
         },
         virtuals = {
             ["kurier-math"] = {
@@ -43,7 +53,7 @@ return {
                 { name = "mi-kuriermi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-kurierm.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-kurierrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-kurierr.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-kurierr.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["kurier-light-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-kurier-light", main = true, parameters = false },
@@ -54,7 +64,7 @@ return {
                 { name = "mi-kurierri.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-kurierr.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-kurierlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-kurierl.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-kurierl.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["kurier-medium-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-kurier-medium", main = true, parameters = false },
@@ -65,7 +75,7 @@ return {
                 { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-kurierh.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-kuriermz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-kurierm.tfm",  vector = "tex-ex", extension = true, badones = badones  },
+                { name = "ex-kurierm.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             },
             ["kurier-heavy-math"] = {
                 { name = "file:LatinModern-Math", features = "virtualmath-kurier-heavy", main = true, parameters = false },
@@ -76,8 +86,9 @@ return {
                 { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F },
                 { name = "rm-kurierh.tfm",  vector = "tex-bf", skewchar=0x7F },
                 { name = "sy-kurierhz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
-                { name = "ex-kurierh.tfm",  vector = "tex-ex", extension = true, badones = badones },
+                { name = "ex-kurierh.tfm",  vector = "tex-ex", extension = true, badones = badones, ignore = uglyones },
             }
         },
+        addmissing = helpers.addmissing,
     }
 }
diff --git a/tex/context/fonts/mkiv/lucida-math.lfg b/tex/context/fonts/mkiv/lucida-math.lfg
index 31589f5b3..64f53dc33 100644
--- a/tex/context/fonts/mkiv/lucida-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-math.lfg
@@ -26,7 +26,7 @@ return {
             aftercopying = {
                 {
                     tweak    = "version",
-                    expected = "Version 1.803",
+                    expected = "Version 1.901",
                 },
                 {
                     tweak   = "fixoldschool",
diff --git a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
index 6ad747307..f5e3158f4 100644
--- a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv
@@ -13,12 +13,34 @@
 
 \starttypescriptcollection[antykwa-torunska]
 
-    \definefontfeature[virtualmath-antykwa]          [virtualmath][virtualweight=antykwa]
-    \definefontfeature[virtualmath-antykwa-cond]     [virtualmath][virtualweight=antykwa-cond]
-    \definefontfeature[virtualmath-antykwa-light]    [virtualmath][virtualweight=antykwa-light]
-    \definefontfeature[virtualmath-antykwa-lightcond][virtualmath][virtualweight=antykwa-lightcond]
+    \startsetups[antykwa]
+      % \setupmathfraction[\c!rule=\v!symbol,\c!middle="0203E]%
+      % \setupmathradical [\c!rule=\v!symbol,\c!top   ="FE010]%
+      % \setupmathfence   [\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
 
-    \starttypescript [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-lightcond,antykwa-torunska-lightcond]
+    % cond => -cont as in iwona
+
+    \startsetups[antykwa-light]              \directsetup{antykwa}\stopsetups
+    \startsetups[antykwa-cond]               \directsetup{antykwa}\stopsetups
+    \startsetups[antykwa-light-cond]         \directsetup{antykwa}\stopsetups
+    % these long names are obsolete and will go away
+    \startsetups[antykwa-torunska]           \directsetup{antykwa}\stopsetups
+    \startsetups[antykwa-torunska-light]     \directsetup{antykwa}\stopsetups
+    \startsetups[antykwa-torunska-cond]      \directsetup{antykwa}\stopsetups
+    \startsetups[antykwa-torunska-light-cond]\directsetup{antykwa}\stopsetups
+
+    \definefontfeature[virtualmath-antykwa]           [virtualmath][virtualweight=antykwa]
+    \definefontfeature[virtualmath-antykwa-cond]      [virtualmath][virtualweight=antykwa-cond]
+    \definefontfeature[virtualmath-antykwa-light]     [virtualmath][virtualweight=antykwa-light]
+    \definefontfeature[virtualmath-antykwa-light-cond][virtualmath][virtualweight=antykwa-light-cond]
+
+    \starttypescript [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-light-cond,antykwa-torunska-light-cond]
         \definetypeface[\typescriptone][\s!rm][\s!serif][\typescriptone] [\s!default]
         \definetypeface[\typescriptone][\s!ss][\s!sans] [modern]         [\s!default] [\s!rscale=1.05]
         \definetypeface[\typescriptone][\s!tt][\s!mono] [modern]         [\s!default] [\s!rscale=1.05]
@@ -26,23 +48,23 @@
         \quittypescriptscanning
     \stoptypescript
 
-    \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-lightcond,antykwa-torunska-lightcond]
-        \definefontsynonym [AntykwaTorunska-Regular]           [\s!file:AntykwaTorunska-Regular]          [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-Italic]            [\s!file:AntykwaTorunska-Italic]           [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-Bold]              [\s!file:AntykwaTorunska-Bold]             [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-BoldItalic]        [\s!file:AntykwaTorunska-BoldItalic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-Light]             [\s!file:AntykwaTorunskaLight-Regular]     [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-LightItalic]       [\s!file:AntykwaTorunskaLight-Italic]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-Medium]            [\s!file:AntykwaTorunskaMed-Regular]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-MediumItalic]      [\s!file:AntykwaTorunskaMed-Italic]        [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondRegular]       [\s!file:AntykwaTorunskaCond-Regular]      [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondItalic]        [\s!file:AntykwaTorunskaCond-Italic]       [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondBold]          [\s!file:AntykwaTorunskaCond-Bold]         [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondBoldItalic]    [\s!file:AntykwaTorunskaCond-BoldItalic]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondLight]         [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondLightItalic]   [\s!file:AntykwaTorunskaCondLight-Italic]  [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondMedium]        [\s!file:AntykwaTorunskaCondMed-Regular]   [\s!features=\s!default]
-        \definefontsynonym [AntykwaTorunska-CondMediumItalic]  [\s!file:AntykwaTorunskaCondMed-Italic]    [\s!features=\s!default]
+    \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-light-cond,antykwa-torunska-light-cond]
+        \definefontsynonym [AntykwaTorunska-Regular]          [\s!file:AntykwaTorunska-Regular]          [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Italic]           [\s!file:AntykwaTorunska-Italic]           [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Bold]             [\s!file:AntykwaTorunska-Bold]             [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-BoldItalic]       [\s!file:AntykwaTorunska-BoldItalic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Light]            [\s!file:AntykwaTorunskaLight-Regular]     [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-LightItalic]      [\s!file:AntykwaTorunskaLight-Italic]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-Medium]           [\s!file:AntykwaTorunskaMed-Regular]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-MediumItalic]     [\s!file:AntykwaTorunskaMed-Italic]        [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondRegular]      [\s!file:AntykwaTorunskaCond-Regular]      [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondItalic]       [\s!file:AntykwaTorunskaCond-Italic]       [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondBold]         [\s!file:AntykwaTorunskaCond-Bold]         [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondBoldItalic]   [\s!file:AntykwaTorunskaCond-BoldItalic]   [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondLight]        [\s!file:AntykwaTorunskaCondLight-Regular] [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondLightItalic]  [\s!file:AntykwaTorunskaCondLight-Italic]  [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondMedium]       [\s!file:AntykwaTorunskaCondMed-Regular]   [\s!features=\s!default]
+        \definefontsynonym [AntykwaTorunska-CondMediumItalic] [\s!file:AntykwaTorunskaCondMed-Italic]    [\s!features=\s!default]
     \stoptypescript
 
     \starttypescript [\s!math][antykwa,antykwa-torunska][\s!all]
@@ -60,45 +82,41 @@
         \definefontsynonym[\s!MathRoman][antykwacondmath@antykwa-cond-math]
     \stoptypescript
 
-    \starttypescript [\s!math][antykwa-lightcond,antykwa-torunska-lightcond][\s!all]
+    \starttypescript [\s!math][antykwa-light-cond,antykwa-torunska-light-cond][\s!all]
         \loadfontgoodies[antykwa-math]
-        \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-lightcond-math]
+        \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-light-cond-math]
     \stoptypescript
 
     \starttypescript [\s!serif] [antykwa,antykwa-torunska] [\s!name]
-        \definefontsynonym [\s!Serif]            [AntykwaTorunska-Regular]
-        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-Bold]
-        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-Italic]
-        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-Italic]
-        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-BoldItalic]
-        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-BoldItalic]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [AntykwaTorunska-Regular]
+        \definefontsynonym [\s!SerifBold]       [AntykwaTorunska-Bold]
+        \definefontsynonym [\s!SerifItalic]     [AntykwaTorunska-Italic]
+        \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-BoldItalic]
     \stoptypescript
 
     \starttypescript [\s!serif] [antykwa-light,antykwa-torunska-light] [\s!name]
-        \definefontsynonym [\s!Serif]            [AntykwaTorunska-Light]
-        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-Medium]
-        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-LightItalic]
-        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-LightItalic]
-        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-MediumItalic]
-        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-MediumItalic]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [AntykwaTorunska-Light]
+        \definefontsynonym [\s!SerifBold]       [AntykwaTorunska-Medium]
+        \definefontsynonym [\s!SerifItalic]     [AntykwaTorunska-LightItalic]
+        \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-MediumItalic]
     \stoptypescript
 
     \starttypescript [\s!serif] [antykwa-cond,antykwa-torunska-cond] [\s!name]
-        \definefontsynonym [\s!Serif]            [AntykwaTorunska-CondRegular]
-        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-CondBold]
-        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-CondItalic]
-        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-CondItalic]
-        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-CondBoldItalic]
-        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondBoldItalic]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [AntykwaTorunska-CondRegular]
+        \definefontsynonym [\s!SerifBold]       [AntykwaTorunska-CondBold]
+        \definefontsynonym [\s!SerifItalic]     [AntykwaTorunska-CondItalic]
+        \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondBoldItalic]
     \stoptypescript
 
-    \starttypescript [\s!serif] [antykwa-lightcond,antykwa-torunska-lightcond] [\s!name]
-        \definefontsynonym [\s!Serif]            [AntykwaTorunska-CondLight]
-        \definefontsynonym [\s!SerifBold]        [AntykwaTorunska-CondMedium]
-        \definefontsynonym [\s!SerifItalic]      [AntykwaTorunska-CondLightItalic]
-        \definefontsynonym [\s!SerifSlanted]     [AntykwaTorunska-CondLightItalic]
-        \definefontsynonym [\s!SerifBoldItalic]  [AntykwaTorunska-CondMediumItalic]
-        \definefontsynonym [\s!SerifBoldSlanted] [AntykwaTorunska-CondMediumItalic]
+    \starttypescript [\s!serif] [antykwa-light-cond,antykwa-torunska-light-cond] [\s!name]
+        \setups[\s!font:\s!fallback:\s!serif]
+        \definefontsynonym [\s!Serif]           [AntykwaTorunska-CondLight]
+        \definefontsynonym [\s!SerifBold]       [AntykwaTorunska-CondMedium]
+        \definefontsynonym [\s!SerifItalic]     [AntykwaTorunska-CondLightItalic]
+        \definefontsynonym [\s!SerifBoldItalic] [AntykwaTorunska-CondMediumItalic]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
index 8b67b7be9..f43731250 100644
--- a/tex/context/fonts/mkiv/type-imp-iwona.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv
@@ -13,34 +13,52 @@
 
 \starttypescriptcollection[iwona]
 
+    \startsetups[iwona]
+      % \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[iwona-light]      \directsetup{antykwa}\stopsetups
+    \startsetups[iwona-medium]     \directsetup{antykwa}\stopsetups
+    \startsetups[iwona-heavy]      \directsetup{antykwa}\stopsetups
+    \startsetups[iwona-cond]       \directsetup{antykwa}\stopsetups
+    \startsetups[iwona-light-cond] \directsetup{antykwa}\stopsetups
+    \startsetups[iwona-medium-cond]\directsetup{antykwa}\stopsetups
+    \startsetups[iwona-heavy-cond] \directsetup{antykwa}\stopsetups
+
     \definefontfeature[virtualmath-iwona]       [virtualmath][virtualweight=iwona]
     \definefontfeature[virtualmath-iwona-light] [virtualmath][virtualweight=iwona-light]
     \definefontfeature[virtualmath-iwona-medium][virtualmath][virtualweight=iwona-medium]
     \definefontfeature[virtualmath-iwona-heavy] [virtualmath][virtualweight=iwona-heavy]
 
-    \starttypescript [\s!sans] [iwona-light,iwona,iwona-medium,iwona-heavy,iwona-light-cond,iwona-cond,iwona-medium-cond,iwona-heavy-cond]
-
-        \definefontsynonym [Iwona-Regular]               [\s!file:Iwona-Regular]                [\s!features=\s!default]
-        \definefontsynonym [Iwona-Italic]                [\s!file:Iwona-Italic]                 [\s!features=\s!default]
-        \definefontsynonym [Iwona-Bold]                  [\s!file:Iwona-Bold]                   [\s!features=\s!default]
-        \definefontsynonym [Iwona-BoldItalic]            [\s!file:Iwona-BoldItalic]             [\s!features=\s!default]
-        \definefontsynonym [Iwona-Light-Regular]         [\s!file:IwonaLight-Regular]           [\s!features=\s!default]
-        \definefontsynonym [Iwona-Light-Italic]          [\s!file:IwonaLight-Italic]            [\s!features=\s!default]
-        \definefontsynonym [Iwona-Medium-Regular]        [\s!file:IwonaMedium-Regular]          [\s!features=\s!default]
-        \definefontsynonym [Iwona-Medium-Italic]         [\s!file:IwonaMedium-Italic]           [\s!features=\s!default]
-        \definefontsynonym [Iwona-Heavy-Regular]         [\s!file:IwonaHeavy-Regular]           [\s!features=\s!default]
-        \definefontsynonym [Iwona-Heavy-Italic]          [\s!file:IwonaHeavy-Italic]            [\s!features=\s!default]
-
-        \definefontsynonym [Iwona-CondRegular]           [\s!file:IwonaCond-Regular]            [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondItalic]            [\s!file:IwonaCond-Italic]             [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondBold]              [\s!file:IwonaCond-Bold]               [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondBoldItalic]        [\s!file:IwonaCond-BoldItalic]         [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondLight-Regular]     [\s!file:IwonaCondLight-Regular]       [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondLight-Italic]      [\s!file:IwonaCondLight-Italic]        [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondMedium-Regular]    [\s!file:IwonaCondMedium-Regular]      [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondMedium-Italic]     [\s!file:IwonaCondMedium-Italic]       [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondHeavy-Regular]     [\s!file:IwonaCondHeavy-Regular]       [\s!features=\s!default]
-        \definefontsynonym [Iwona-CondHeavy-Italic]      [\s!file:IwonaCondHeavy-Italic]        [\s!features=\s!default]
+    \starttypescript [\s!sans] [iwona,iwona-light,iwona-medium,iwona-heavy,iwona-cond,iwona-light-cond,iwona-medium-cond,iwona-heavy-cond]
+
+        \definefontsynonym [Iwona-Regular]            [\s!file:Iwona-Regular]           [\s!features=\s!default]
+        \definefontsynonym [Iwona-Italic]             [\s!file:Iwona-Italic]            [\s!features=\s!default]
+        \definefontsynonym [Iwona-Bold]               [\s!file:Iwona-Bold]              [\s!features=\s!default]
+        \definefontsynonym [Iwona-BoldItalic]         [\s!file:Iwona-BoldItalic]        [\s!features=\s!default]
+        \definefontsynonym [Iwona-Light-Regular]      [\s!file:IwonaLight-Regular]      [\s!features=\s!default]
+        \definefontsynonym [Iwona-Light-Italic]       [\s!file:IwonaLight-Italic]       [\s!features=\s!default]
+        \definefontsynonym [Iwona-Medium-Regular]     [\s!file:IwonaMedium-Regular]     [\s!features=\s!default]
+        \definefontsynonym [Iwona-Medium-Italic]      [\s!file:IwonaMedium-Italic]      [\s!features=\s!default]
+        \definefontsynonym [Iwona-Heavy-Regular]      [\s!file:IwonaHeavy-Regular]      [\s!features=\s!default]
+        \definefontsynonym [Iwona-Heavy-Italic]       [\s!file:IwonaHeavy-Italic]       [\s!features=\s!default]
+
+        \definefontsynonym [Iwona-CondRegular]        [\s!file:IwonaCond-Regular]       [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondItalic]         [\s!file:IwonaCond-Italic]        [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondBold]           [\s!file:IwonaCond-Bold]          [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondBoldItalic]     [\s!file:IwonaCond-BoldItalic]    [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondLight-Regular]  [\s!file:IwonaCondLight-Regular]  [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondLight-Italic]   [\s!file:IwonaCondLight-Italic]   [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondMedium-Regular] [\s!file:IwonaCondMedium-Regular] [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondMedium-Italic]  [\s!file:IwonaCondMedium-Italic]  [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondHeavy-Regular]  [\s!file:IwonaCondHeavy-Regular]  [\s!features=\s!default]
+        \definefontsynonym [Iwona-CondHeavy-Italic]   [\s!file:IwonaCondHeavy-Italic]   [\s!features=\s!default]
 
     \stoptypescript
 
@@ -65,59 +83,59 @@
 
     \starttypescript [\s!sans] [iwona-light] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-Light-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-Light-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-Medium-Regular]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Medium-Italic]
+        \definefontsynonym [\s!Sans]           [Iwona-Light-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-Light-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-Medium-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-Medium-Italic]
     \stoptypescript
 
     \starttypescript [\s!sans] [iwona] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-Bold]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-BoldItalic]
+        \definefontsynonym [\s!Sans]           [Iwona-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-Bold]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-BoldItalic]
     \stoptypescript
 
     \starttypescript [\s!sans] [iwona-medium] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-Medium-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-Medium-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-Heavy-Regular]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Heavy-Italic]
+        \definefontsynonym [\s!Sans]           [Iwona-Medium-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-Medium-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic]
     \stoptypescript
 
     \starttypescript [\s!sans] [iwona-heavy] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-Heavy-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-Heavy-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-Heavy-Regular]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-Heavy-Italic]
+        \definefontsynonym [\s!Sans]           [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-Heavy-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-Heavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic]
     \stoptypescript
 
     \starttypescript [\s!sans] [iwona-light-cond] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-CondLight-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-CondLight-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-CondMedium-Regular]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondMedium-Italic]
+        \definefontsynonym [\s!Sans]           [Iwona-CondLight-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CondLight-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CondMedium-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CondMedium-Italic]
     \stoptypescript
 
 
     \starttypescript [\s!sans] [iwona-cond] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-CondRegular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-CondItalic]
-        \definefontsynonym [\s!SansBold]        [Iwona-CondBold]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondBoldItalic]
+        \definefontsynonym [\s!Sans]           [Iwona-CondRegular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CondItalic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CondBold]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CondBoldItalic]
     \stoptypescript
 
     \starttypescript [\s!sans] [iwona-medium-cond] [\s!name]
         \setups[\s!font:\s!fallback:\s!sans]
-        \definefontsynonym [\s!Sans]            [Iwona-CondMedium-Regular]
-        \definefontsynonym [\s!SansItalic]      [Iwona-CondMedium-Italic]
-        \definefontsynonym [\s!SansBold]        [Iwona-CondHeavy-Regular]
-        \definefontsynonym [\s!SansBoldItalic]  [Iwona-CondHeavy-Italic]
+        \definefontsynonym [\s!Sans]           [Iwona-CondMedium-Regular]
+        \definefontsynonym [\s!SansItalic]     [Iwona-CondMedium-Italic]
+        \definefontsynonym [\s!SansBold]       [Iwona-CondHeavy-Regular]
+        \definefontsynonym [\s!SansBoldItalic] [Iwona-CondHeavy-Italic]
     \stoptypescript
 
     \starttypescript [iwona,iwona-light,iwona-heavy,iwona-medium]