2023-01-15 13:55:00

3 files changed, 42 insertions, 7 deletions

diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg
index 32152e15d..c9021352b 100644
--- a/tex/context/fonts/mkiv/bonum-math.lfg
+++ b/tex/context/fonts/mkiv/bonum-math.lfg
@@ -42,11 +42,19 @@ return {
                     tweak   = "replacealphabets",
                     list    = {
                         {
-                            source   = { first = 0x003B1 },
+                            source   = { first = 0x003B1 }, -- upright alpha
                             filename = "texgyrebonummath-companion.otf",
                         },
                         {
-                            source   = { first = 0x1D6FC },
+                            source   = { first = 0x1D6FC }, -- italic alpha
+                            filename = "texgyrebonummath-companion.otf",
+                        },
+                        {
+                            source   = { first = 0x1D6C2 }, -- bold upright alpha
+                            filename = "texgyrebonummath-companion.otf",
+                        },
+                        {
+                            source   = { first = 0x1D736 }, -- bold italic alpha
                             filename = "texgyrebonummath-companion.otf",
                         },
                     },
diff --git a/tex/context/fonts/mkiv/ebgaramond-math.lfg b/tex/context/fonts/mkiv/ebgaramond-math.lfg
index d5d31c73f..812430525 100644
--- a/tex/context/fonts/mkiv/ebgaramond-math.lfg
+++ b/tex/context/fonts/mkiv/ebgaramond-math.lfg
@@ -81,6 +81,12 @@ return {
                         ["0x27E9.variants.*"]   = { topright = -0.2,  bottomright = -0.2  },
                         [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
+                        [0x1D478]               = { bottomright = 0.05 }, -- Bold Q
+                        [0x1D5B0]               = { bottomright = 0.05 }, -- Sans Q
                     },
                 },
                 {
diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
index 3be50a2de..31026df5b 100644
--- a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv
@@ -29,11 +29,15 @@
 \definefontfeature
   [eb-garamond-normal]
   [default]
-  [mode=node,ccmp=yes,
-   calt=yes,liga=yes,
-   dlig=yes,hlig=yes,
-   kern=yes,mark=yes,mkmk=yes,
-   onum=yes,pnum=yes,salt=yes,
+  [mode=node,
+   ccmp=yes,
+   calt=yes,
+   dlig=no,
+   hlig=no,
+ % salt=yes,
+ % onum=yes,
+   onum=no,
+   pnum=yes,
    script=latn]
 
 \definefontfeature
@@ -41,6 +45,11 @@
   [eb-garamond-normal]
   [smcp=yes,c2sc=yes]
 
+\definefontfeature
+  [ysabeau-smallcaps]
+  [default]
+  [smcp=yes,c2sc=yes]
+
 % \loadtypescriptfile[ebgaramond]
 %
 % \definefontfeature
@@ -67,6 +76,17 @@
         \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]
+     \stoptypescript
+
     \starttypescript [\s!math] [ebgaramond,ebgaramond-nt]
         \checkedmapfontsize[\typescripttwo][\s!script]      [.70]
         \checkedmapfontsize[\typescripttwo][\s!scriptscript][.50]
@@ -84,6 +104,7 @@
 
     \starttypescript[ebgaramond,ebgaramond-nt]
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [ebgaramond]     [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [ysabeau]        [\s!default]
         \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]         [\s!default] [\s!rscale=0.8]
       % \definetypeface [\typescriptone] [\s!mm] [\s!math]  [bonum]          [\s!default] [\s!rscale=0.8]
         \definetypeface [\typescriptone] [\s!mm] [\s!math]  [\typescriptone] [\s!default]