2023-02-06 17:57:00

1 files changed, 49 insertions, 23 deletions

diff --git a/tex/context/fonts/mkiv/iwona-math.lfg b/tex/context/fonts/mkiv/iwona-math.lfg
index f2fb69341..bc402ea33 100644
--- a/tex/context/fonts/mkiv/iwona-math.lfg
+++ b/tex/context/fonts/mkiv/iwona-math.lfg
@@ -1,5 +1,23 @@
-local msam = { name = "msam10.tfm", vector = "tex-ma" }
-local msbm = { name = "msbm10.tfm", vector = "tex-mb" }
+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,
+}
 
 return {
     name = "iwona-math",
@@ -17,41 +35,49 @@ return {
         },
         virtuals = {
             ["iwona-math"] = {
-                { name = "file:Iwona-Regular", features = "virtualmath", main = true },
+                { name = "file:LatinModern-Math", features = "virtualmath-iwona", main = true, parameters = false },
+                --
+                { name = "rm-iwonar.tfm",  vector = "tex-mr", skewchar=0x7F },
                 { name = "mi-iwonari.tfm", vector = "tex-mi", skewchar=0x7F },
                 { name = "mi-iwonari.tfm", vector = "tex-it", skewchar=0x7F },
-                { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-                { name = "ex-iwonar.tfm", vector = "tex-ex", extension = true } ,
-                msam,
-                msbm,
+                { 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 },
             },
             ["iwona-light-math"] = {
-                { name = "file:IwonaLight-Regular", features = "virtualmath", main = true },
+                { name = "file:LatinModern-Math", features = "virtualmath-iwona-light", main = true, parameters = false },
+                --
+                { name = "rm-iwonal.tfm",  vector = "tex-mr", skewchar=0x7F },
                 { name = "mi-iwonali.tfm", vector = "tex-mi", skewchar=0x7F },
                 { name = "mi-iwonali.tfm", vector = "tex-it", skewchar=0x7F },
-                { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-                { name = "ex-iwonal.tfm", vector = "tex-ex", extension = true } ,
-                msam,
-                msbm,
+                { 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 },
             },
             ["iwona-medium-math"] = {
-                { name = "file:IwonaMedium-Regular", features = "virtualmath", main = true },
+                { name = "file:LatinModern-Math", features = "virtualmath-iwona-medium", main = true, parameters = false },
+                --
+                { name = "rm-iwonam.tfm",  vector = "tex-mr", skewchar=0x7F },
                 { name = "mi-iwonami.tfm", vector = "tex-mi", skewchar=0x7F },
                 { name = "mi-iwonami.tfm", vector = "tex-it", skewchar=0x7F },
-                { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-                { name = "ex-iwonam.tfm", vector = "tex-ex", extension = true } ,
-                msam,
-                msbm,
+                { 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  },
             },
             ["iwona-heavy-math"] = {
-                { name = "file:IwonaHeavy-Regular", features = "virtualmath", main = true },
+                { name = "file:LatinModern-Math", features = "virtualmath-iwona-heavy", main = true, parameters = false },
+                --
+                { name = "rm-iwonah.tfm",  vector = "tex-mr", skewchar=0x7F },
                 { name = "mi-iwonahi.tfm", vector = "tex-mi", skewchar=0x7F },
                 { name = "mi-iwonahi.tfm", vector = "tex-it", skewchar=0x7F },
-                { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-                { name = "ex-iwonah.tfm", vector = "tex-ex", extension = true } ,
-                msam,
-                msbm,
+                { 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 },
             }
-        }
+        },
     }
 }