2021-01-17 21:42:00

9 files changed, 143 insertions, 37 deletions

diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg
index 8dfa63405..51ca2d7f1 100644
--- a/tex/context/fonts/mkiv/bonum-math.lfg
+++ b/tex/context/fonts/mkiv/bonum-math.lfg
@@ -1,5 +1,8 @@
-local kern_200 = { bottomright = { { kern = -200 } } }
-local kern_100 = { bottomright = { { kern = -100 } } }
+local kern_V   = { bottomright = { { kern = -200 } } }
+local kern_W   = { bottomright = { { kern = -100 } } }
+local offset_f = { xoffset = "llx" }
+
+-- Beware of updates in ssty slots!
 
 return {
     name = "bonum-math",
@@ -10,12 +13,21 @@ return {
     mathematics = {
         dimensions = {
             default = {
-                [0x1D453] = { xoffset = "llx" },-- 𝑓
+             -- [0x1D453]     = offset_f, -- 𝑓
+             -- ["1:0x1D453"] = offset_f, -- needed for compact
+             -- ["2:0x1D453"] = offset_f, -- needed for compact
+                ["*:0x1D453"] = offset_f, -- 𝑓
             },
         },
         kerns = {
-            [0x1D449] = kern_200, -- 𝑉
-            [0x1D44A] = kern_100, -- 𝑊
+         -- [0x1D449]     = kern_V, -- 𝑉
+         -- ["1:0x1D449"] = kern_V, -- needed for compact
+         -- ["2:0x1D449"] = kern_V, -- needed for compact
+         -- [0x1D44A]     = kern_W, -- 𝑊
+         -- ["1:0x1D44A"] = kern_W, -- needed for compact
+         -- ["2:0x1D44A"] = kern_W, -- needed for compact
+            ["*:0x1D449"] = kern_V, -- 𝑉
+            ["*:0x1D44A"] = kern_W, -- 𝑊
         },
         alternates = {
             dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
diff --git a/tex/context/fonts/mkiv/dejavu-math.lfg b/tex/context/fonts/mkiv/dejavu-math.lfg
index d28c69060..608b396f8 100644
--- a/tex/context/fonts/mkiv/dejavu-math.lfg
+++ b/tex/context/fonts/mkiv/dejavu-math.lfg
@@ -1,4 +1,7 @@
-local kern_250 = { bottomright = { { kern = -250 } } }
+local kern_V = { bottomright = { { kern = -250 } } }
+local kern_W = kern_W
+
+-- Beware of updates in ssty slots!
 
 return {
     name = "dejavu-math",
@@ -8,8 +11,14 @@ return {
     copyright = "ConTeXt development team",
     mathematics = {
         kerns = {
-            [0x1D449] = kern_250, --
-            [0x1D44A] = kern_250, -- 𝑊
+         -- [0x1D449]     = kern_V, -- 𝑉
+         -- ["1:0x1D449"] = kern_V, -- needed for compact
+         -- ["2:0x1D449"] = kern_V, -- needed for compact
+         -- [0x1D44A]     = kern_W, -- 𝑊
+         -- ["1:0x1D44A"] = kern_W, -- needed for compact
+         -- ["2:0x1D44A"] = kern_W, -- needed for compact
+            ["*:0x1D449"] = kern_V, -- 𝑉
+            ["*:0x1D44A"] = kern_W, -- 𝑊
         },
         alternates = {
             dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
diff --git a/tex/context/fonts/mkiv/minion-math.lfg b/tex/context/fonts/mkiv/minion-math.lfg
index a4f539ec7..863836c1c 100644
--- a/tex/context/fonts/mkiv/minion-math.lfg
+++ b/tex/context/fonts/mkiv/minion-math.lfg
@@ -1,6 +1,5 @@
-local kern_100 = { bottomright = { { kern = -100 } } }
-local kern_150 = { bottomright = { { kern = -150 } } }
-local kern_200 = { bottomright = { { kern = -200 } } }
+local kern_W = { bottomright = { { kern = -150 } } }
+local kern_V = { bottomright = { { kern = -200 } } }
 
 return {
     name = "minion-math",
@@ -23,8 +22,9 @@ return {
     },
     mathematics = {
         kerns = {
-            [0x1D449] = kern_200, -- 𝑉
-            [0x1D44A] = kern_150, -- 𝑊
+            [0x1D449] = kern_V, -- 𝑉
+            [0x1D44A] = kern_W, -- 𝑊
+            -- todo: ssty 1/2
         },
     },
 }
diff --git a/tex/context/fonts/mkiv/pagella-math.lfg b/tex/context/fonts/mkiv/pagella-math.lfg
index c85ff3f6b..d4ae14162 100644
--- a/tex/context/fonts/mkiv/pagella-math.lfg
+++ b/tex/context/fonts/mkiv/pagella-math.lfg
@@ -1,7 +1,8 @@
-local kern_200 = { bottomright = { { kern = -200 } } }
-local kern_100 = { bottomright = { { kern = -100 } } }
+local kern_V   = { bottomright = { { kern = -200 } } }
+local kern_W   = { bottomright = { { kern = -100 } } }
+local offset_f = { xoffset = "llx" }
 
--- Beware of updates !
+-- Beware of updates in ssty slots!
 
 return {
     name = "pagella-math",
@@ -12,13 +13,22 @@ return {
     mathematics = {
         dimensions = {
             default = {
-             -- [0x1D453] = { xoffset = 162, width = 278 + 162 },-- 𝑓
-                [0x1D453] = { xoffset = "llx" },-- 𝑓
+             -- [0x1D453]     = { xoffset = 162, width = 278 + 162 },-- 𝑓
+             -- [0x1D453]     = offset_f, -- 𝑓
+             -- ["1:0x1D453"] = offset_f, -- needed for compact
+             -- ["2:0x1D453"] = offset_f, -- needed for compact
+                ["*:0x1D453"] = offset_f, -- 𝑓
             },
         },
         kerns = {
-            [0x1D449] = kern_200, -- 𝑉
-            [0x1D44A] = kern_100, -- 𝑊
+         -- [0x1D449]     = kern_V, -- 𝑉
+         -- ["1:0x1D449"] = kern_V, -- needed for compact
+         -- ["2:0x1D449"] = kern_V, -- needed for compact
+         -- [0x1D44A]     = kern_W, -- 𝑊
+         -- ["1:0x1D44A"] = kern_W, -- needed for compact
+         -- ["2:0x1D44A"] = kern_W, -- needed for compact
+            ["*:0x1D449"] = kern_V, -- 𝑉
+            ["*:0x1D44A"] = kern_W, -- 𝑊
         },
         alternates = {
             dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
diff --git a/tex/context/fonts/mkiv/schola-math.lfg b/tex/context/fonts/mkiv/schola-math.lfg
index 9787c18a9..b60bc6d99 100644
--- a/tex/context/fonts/mkiv/schola-math.lfg
+++ b/tex/context/fonts/mkiv/schola-math.lfg
@@ -1,5 +1,7 @@
-local kern_200_050 = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } }
-local kern_100_050 = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } }
+local kern_V = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } }
+local kern_W = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } }
+
+-- Beware of updates in ssty slots!
 
 return {
     name = "schola-math",
@@ -9,8 +11,14 @@ return {
     copyright = "ConTeXt development team",
     mathematics = {
         kerns = {
-            [0x1D449] = kern_200_050, --
-            [0x1D44A] = kern_100_050, -- 𝑊
+         -- [0x1D449]     = kern_V, -- 𝑉
+         -- ["1:0x1D449"] = kern_V, -- needed for compact
+         -- ["2:0x1D449"] = kern_V, -- needed for compact
+         -- [0x1D44A]     = kern_W, -- 𝑊
+         -- ["1:0x1D44A"] = kern_W, -- needed for compact
+         -- ["2:0x1D44A"] = kern_W, -- needed for compact
+            ["*:0x1D449"] = kern_V, -- 𝑉
+            ["*:0x1D44A"] = kern_W, -- 𝑊
         },
         alternates = {
             dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
diff --git a/tex/context/fonts/mkiv/termes-math.lfg b/tex/context/fonts/mkiv/termes-math.lfg
index 1501fd536..3cf8685eb 100644
--- a/tex/context/fonts/mkiv/termes-math.lfg
+++ b/tex/context/fonts/mkiv/termes-math.lfg
@@ -1,5 +1,8 @@
-local kern_200 = { bottomright = { { kern = -200 } } }
-local kern_100 = { bottomright = { { kern = -100 } } }
+local kern_V   = { bottomright = { { kern = -200 } } }
+local kern_W   = { bottomright = { { kern = -100 } } }
+local offset_f = { xoffset = "llx" }
+
+-- Beware of updates in ssty slots!
 
 return {
     name = "termes-math",
@@ -10,12 +13,21 @@ return {
     mathematics = {
         dimensions = {
             default = {
-                [0x1D453] = { xoffset = "llx" },-- 𝑓
+             -- [0x1D453]     = offset_f, -- 𝑓
+             -- ["1:0x1D453"] = offset_f, -- needed for compact
+             -- ["2:0x1D453"] = offset_f, -- needed for compact
+                ["*:0x1D453"] = offset_f, -- 𝑓
             },
         },
         kerns = {
-            [0x1D449] = kern_200, -- 𝑉
-            [0x1D44A] = kern_100, -- 𝑊
+         -- [0x1D449]     = kern_V, -- 𝑉
+         -- ["1:0x1D449"] = kern_V, -- needed for compact
+         -- ["2:0x1D449"] = kern_V, -- needed for compact
+         -- [0x1D44A]     = kern_W, -- 𝑊
+         -- ["1:0x1D44A"] = kern_W, -- needed for compact
+         -- ["2:0x1D44A"] = kern_W, -- needed for compact
+            ["*:0x1D449"] = kern_V, -- 𝑉
+            ["*:0x1D44A"] = kern_W, -- 𝑊
         },
         alternates = {
             dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
diff --git a/tex/context/fonts/mkiv/type-imp-punk.mkxl b/tex/context/fonts/mkiv/type-imp-punk.mkxl
new file mode 100644
index 000000000..aa01a1d4e
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-punk.mkxl
@@ -0,0 +1,54 @@
+%D \module
+%D   [       file=type-imp-punk,
+%D        version=2020.01.17,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Punk Again,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Yet another look at punk.
+
+\ifdefined\enablerandomvariants\else
+    \useMPlibrary[punk]
+\fi
+
+\doifelse {\truefontname{Serif}} {unknown} {
+    \writestatus{fonts}{you need to load a base bodyfont first}
+    \endinput
+} {
+    % we're ok
+}
+
+\starttypescriptcollection[punk]
+
+    \definefontfeature [punk]            [metapost={category=punk,preroll=punkpreroll}]
+    \definefontfeature [punkrandom]      [metapost={category=punk,preroll=punkpreroll,variants=5}]
+    \definefontfeature [punkbold]        [metapost={category=punk,preroll=punkpreroll,weight=2}]
+    \definefontfeature [punkslanted]     [metapost={category=punk,preroll=punkpreroll,slant=.15}]
+    \definefontfeature [punkboldslanted] [metapost={category=punk,preroll=punkpreroll,slant=.15,weight=2}]
+    \definefontfeature [punkveryslanted] [metapost={category=punk,preroll=punkpreroll,slant=-.15}]
+    \definefontfeature [punksqueezed]    [metapost={category=punk,preroll=punkpreroll,squeeze=.5}]
+    \definefontfeature [punkextended]    [metapost={category=punk,preroll=punkpreroll,extend=1.3}]
+
+    \definefontsynonym [punkbase]        [\truefontname{Serif}]
+
+    \starttypescript [\s!serif] [punk]
+        \definefontsynonym [\s!Serif]           [punkbase] [\s!features=punk]
+        \definefontsynonym [\s!SerifSlanted]    [punkbase] [\s!features=punkslanted]
+        \definefontsynonym [\s!SerifBold]       [punkbase] [\s!features=punkbold]
+        \definefontsynonym [\s!SerifBoldSlanted][punkbase] [\s!features=punkboldslanted]
+        \definefontsynonym [\s!SerifItalic]     [\s!SerifSlanted]
+        \definefontsynonym [\s!SerifBoldItalic] [\s!SerifBoldSlanted]
+    \stoptypescript
+
+    \starttypescript [punk]
+        \definetypeface [punk] [\s!rm] [\s!serif] [punk] [\s!default]
+    \stoptypescript
+
+\stoptypescriptcollection
+
diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
index d10fe505f..72d3b3588 100644
--- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -247,8 +247,8 @@
         \starttypescript [\s!math][times,termes][\s!all]
           % \loadfontgoodies[texgyre]
           % \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
-            \definefontsynonym[\s!MathRoman]    [file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,mathextra},\s!goodies=termes-math]
-            \definefontsynonym[\s!MathRomanBold][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,termes-math-bold,mathextra},\s!goodies=termes-math]
+            \definefontsynonym[\s!MathRoman]    [file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=termes-math]
+            \definefontsynonym[\s!MathRomanBold][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,termes-math-bold,mathextra},\s!goodies=termes-math]
         \stoptypescript
 
     \stoptypescriptcollection
@@ -276,8 +276,8 @@
         \starttypescript [\s!math][palatino,pagella][\s!all]
           % \loadfontgoodies[texgyre]
           % \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
-            \definefontsynonym[\s!MathRoman]    [file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,mathextra},\s!goodies=pagella-math]
-            \definefontsynonym[\s!MathRomanBold][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,pagella-math-bold,mathextra},\s!goodies=pagella-math]
+            \definefontsynonym[\s!MathRoman]    [file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=pagella-math]
+            \definefontsynonym[\s!MathRomanBold][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,pagella-math-bold,mathextra},\s!goodies=pagella-math]
         \stoptypescript
 
     \stoptypescriptcollection
@@ -289,8 +289,8 @@
     \starttypescript [\s!math][bookman,bonum][\s!all]
       % \loadfontgoodies[texgyre]
       % \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
-        \definefontsynonym[\s!MathRoman]    [file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,mathextra},\s!goodies=bonum-math]
-        \definefontsynonym[\s!MathRomanBold][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,bonum-math-bold,mathextra},\s!goodies=bonum-math]
+        \definefontsynonym[\s!MathRoman]    [file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=bonum-math]
+        \definefontsynonym[\s!MathRomanBold][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,bonum-math-bold,mathextra},\s!goodies=bonum-math]
     \stoptypescript
 
 \stoptypescriptcollection
@@ -300,8 +300,8 @@
     \starttypescript [\s!math][schoolbook,schola][\s!all]
       % \loadfontgoodies[texgyre]
       % \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
-        \definefontsynonym[\s!MathRoman]    [file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,mathextra},\s!goodies=schola-math]
-        \definefontsynonym[\s!MathRomanBold][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,oldmath,schola-math-bold,mathextra},\s!goodies=schola-math]
+        \definefontsynonym[\s!MathRoman]    [file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=schola-math]
+        \definefontsynonym[\s!MathRomanBold][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,schola-math-bold,mathextra},\s!goodies=schola-math]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/xits-math.lfg b/tex/context/fonts/mkiv/xits-math.lfg
index b37ab1277..88d3a8d45 100644
--- a/tex/context/fonts/mkiv/xits-math.lfg
+++ b/tex/context/fonts/mkiv/xits-math.lfg
@@ -14,6 +14,7 @@ local italics = {
      -- [0x1D44E] = 0.99,    -- a (fraction of quad)
      -- [0x1D44F] = 100,     -- b (font points)
         [0x1D453] = -0.0375, -- f
+        -- todo: ssty 1/2
     }
 }