2016-05-31 09:07:00

9 files changed, 153 insertions, 40 deletions

diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg
new file mode 100644
index 000000000..00576aaef
--- /dev/null
+++ b/tex/context/fonts/mkiv/bonum-math.lfg
@@ -0,0 +1,19 @@
+local kern_200 = { bottomright = { { kern = -200 } } }
+local kern_100 = { bottomright = { { kern = -100 } } }
+
+return {
+    name = "bonum-math",
+    version = "1.00",
+    comment = "Goodies that complement bonum.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_200, --
+            [0x1D44A] = kern_100, -- 𝑊
+        },
+        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
new file mode 100644
index 000000000..d28c69060
--- /dev/null
+++ b/tex/context/fonts/mkiv/dejavu-math.lfg
@@ -0,0 +1,18 @@
+local kern_250 = { bottomright = { { kern = -250 } } }
+
+return {
+    name = "dejavu-math",
+    version = "1.00",
+    comment = "Goodies that complement dejavu.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_250, --
+            [0x1D44A] = kern_250, -- 𝑊
+        },
+        alternates = {
+            dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
+        },
+    },
+}
diff --git a/tex/context/fonts/mkiv/lm.lfg b/tex/context/fonts/mkiv/lm.lfg
index 546d18def..7ea5059e9 100644
--- a/tex/context/fonts/mkiv/lm.lfg
+++ b/tex/context/fonts/mkiv/lm.lfg
@@ -1,6 +1,9 @@
 -- In order to be able to use beta math fonts, we use our own file name and
 -- always remap.
 
+local kern_150 = { bottomright = { { kern = -150 } } }
+local kern_200 = { bottomright = { { kern = -200 } } }
+
 return {
     name = "latin modern",
     version = "1.00",
@@ -14,6 +17,10 @@ return {
             --  mathematics.tweaks.fixoverline,
             },
         },
+        kerns = {
+            [0x1D449] = kern_150, --
+            [0x1D44A] = kern_200, -- 𝑊
+        },
         dimensions = {
             -- always applied
          -- default = {
diff --git a/tex/context/fonts/mkiv/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
index 946458dea..29206da1a 100644
--- a/tex/context/fonts/mkiv/lucida-opentype-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
@@ -1,3 +1,5 @@
+----- kern_250 = { bottomright = { { kern = -250 } }, force = true }
+
 return {
     name = "lucida-opentype-math",
     version = "1.00",
@@ -13,6 +15,10 @@ return {
             zero         = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" },
             partial      = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Upright Partial Differential" },
         },
+     -- kerns = {
+     --     [0x1D449] = kern_250, --
+     --     [0x1D44A] = kern_250, -- 𝑊
+     -- },
         dimensions = {
             default = { -- experimental values
                 [0x2044] = { xoffset = 275, width = 600 },
diff --git a/tex/context/fonts/mkiv/pagella-math.lfg b/tex/context/fonts/mkiv/pagella-math.lfg
new file mode 100644
index 000000000..40d50383b
--- /dev/null
+++ b/tex/context/fonts/mkiv/pagella-math.lfg
@@ -0,0 +1,19 @@
+local kern_200 = { bottomright = { { kern = -200 } } }
+local kern_100 = { bottomright = { { kern = -100 } } }
+
+return {
+    name = "pagella-math",
+    version = "1.00",
+    comment = "Goodies that complement pagella.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_200, --
+            [0x1D44A] = kern_100, -- 𝑊
+        },
+        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
new file mode 100644
index 000000000..9787c18a9
--- /dev/null
+++ b/tex/context/fonts/mkiv/schola-math.lfg
@@ -0,0 +1,19 @@
+local kern_200_050 = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } }
+local kern_100_050 = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } }
+
+return {
+    name = "schola-math",
+    version = "1.00",
+    comment = "Goodies that complement schola.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_200_050, --
+            [0x1D44A] = kern_100_050, -- 𝑊
+        },
+        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
new file mode 100644
index 000000000..557216cb1
--- /dev/null
+++ b/tex/context/fonts/mkiv/termes-math.lfg
@@ -0,0 +1,19 @@
+local kern_200 = { bottomright = { { kern = -200 } } }
+local kern_100 = { bottomright = { { kern = -100 } } }
+
+return {
+    name = "termes-math",
+    version = "1.00",
+    comment = "Goodies that complement termes.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_200, --
+            [0x1D44A] = kern_100, -- 𝑊
+        },
+        alternates = {
+            dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" },
+        },
+    },
+}
diff --git a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
index 41cf1f701..6ae26e0a7 100644
--- a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
@@ -40,15 +40,16 @@
     \stoptypescript
 
     \starttypescript [\s!math][dejavu][\s!name]
-       %\loadfontgoodies[dejavu]
-        \definefontsynonym[\s!MathRoman][file:dejavu-math.otf][\s!features=\s!math\mathsizesuffix]
+        \loadfontgoodies[dejavu-math]
+      % \definefontsynonym[\s!MathRoman][file:dejavu-math.otf][\s!features=\s!math\mathsizesuffix]
+        \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features=\s!math\mathsizesuffix,\s!goodies=dejavu-math]
     \stoptypescript
 
     \starttypescript[dejavu]
         \definetypeface [dejavu] [\s!rm] [\s!serif] [dejavu] [\s!default]
         \definetypeface [dejavu] [\s!ss] [\s!sans]  [dejavu] [\s!default]
         \definetypeface [dejavu] [\s!tt] [\s!mono]  [dejavu] [\s!default]
-%       \definetypeface [dejavu] [\s!mm] [\s!math]  [xits]   [\s!default] [\s!rscale=1.2]
+      % \definetypeface [dejavu] [\s!mm] [\s!math]  [xits]   [\s!default] [\s!rscale=1.2]
         \definetypeface [dejavu] [\s!mm] [\s!math]  [dejavu] [\s!default]
     \stoptypescript
 
@@ -99,7 +100,7 @@
         \definetypeface [dejavu-condensed] [\s!rm] [\s!serif] [dejavu-condensed] [\s!default]
         \definetypeface [dejavu-condensed] [\s!ss] [\s!sans]  [dejavu-condensed] [\s!default]
         \definetypeface [dejavu-condensed] [\s!tt] [\s!mono]  [dejavu-condensed] [\s!default]
-%       \definetypeface [dejavu-condensed] [\s!mm] [\s!math]  [xits]             [\s!default] [\s!rscale=1.2]
+      % \definetypeface [dejavu-condensed] [\s!mm] [\s!math]  [xits]             [\s!default] [\s!rscale=1.2]
         \definetypeface [dejavu-condensed] [\s!mm] [\s!math]  [dejavu]           [\s!default]
     \stoptypescript
 
diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
index 86db8c603..e617a2505 100644
--- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -215,54 +215,28 @@
 
 \stoptypescriptcollection
 
-\startmode[txmath]
-
-    \starttypescriptcollection[texgyre-math-times]
-
-        \starttypescript [\s!math][times,termes][\s!all]
-            \loadfontgoodies[tx-math]
-            \definefontsynonym[\s!MathRoman][txmath@tx-math]
-          % \definefontsynonym[\s!MathRomanBold][MathRoman]
-        \stoptypescript
-
-    \stoptypescriptcollection
-
-\stopmode
-
 \startnotmode[txmath]
 
     \starttypescriptcollection[texgyre-math-times]
 
         \starttypescript [\s!math][times,termes][\s!all]
-            \loadfontgoodies[texgyre]
-            \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+          % \loadfontgoodies[texgyre]
+          % \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyretermes-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=termes-math]
         \stoptypescript
 
     \stoptypescriptcollection
 
 \stopnotmode
 
-\startmode[pxmath]
-
-    \starttypescriptcollection[texgyre-math-pagella]
-
-        \starttypescript [\s!math][palatino,pagella][\s!all]
-            \loadfontgoodies[px-math]
-            \definefontsynonym[\s!MathRoman][pxmath@px-math]
-          % \definefontsynonym[\s!MathRomanBold][MathRoman]
-        \stoptypescript
-
-    \stoptypescriptcollection
-
-\stopmode
-
 \startnotmode[pxmath]
 
     \starttypescriptcollection[texgyre-math-pagella]
 
         \starttypescript [\s!math][palatino,pagella][\s!all]
-            \loadfontgoodies[texgyre]
-            \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+          % \loadfontgoodies[texgyre]
+          % \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyrepagella-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=pagella-math]
         \stoptypescript
 
     \stoptypescriptcollection
@@ -272,8 +246,9 @@
 \starttypescriptcollection[texgyre-math-bonum]
 
     \starttypescript [\s!math][bookman,bonum][\s!all]
-        \loadfontgoodies[texgyre]
-        \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+      % \loadfontgoodies[texgyre]
+      % \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyrebonum-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=bonum-math]
     \stoptypescript
 
 \stoptypescriptcollection
@@ -281,8 +256,38 @@
 \starttypescriptcollection[texgyre-math-schola]
 
     \starttypescript [\s!math][schoolbook,schola][\s!all]
-        \loadfontgoodies[texgyre]
-        \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+      % \loadfontgoodies[texgyre]
+      % \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyreschola-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=schola-math]
     \stoptypescript
 
 \stoptypescriptcollection
+
+\startmode[txmath]
+
+    \starttypescriptcollection[texgyre-math-times]
+
+        \starttypescript [\s!math][times,termes][\s!all]
+            \loadfontgoodies[tx-math]
+            \definefontsynonym[\s!MathRoman][txmath@tx-math]
+          % \definefontsynonym[\s!MathRomanBold][MathRoman]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopmode
+
+\startmode[pxmath]
+
+    \starttypescriptcollection[texgyre-math-pagella]
+
+        \starttypescript [\s!math][palatino,pagella][\s!all]
+            \loadfontgoodies[px-math]
+            \definefontsynonym[\s!MathRoman][pxmath@px-math]
+          % \definefontsynonym[\s!MathRomanBold][MathRoman]
+        \stoptypescript
+
+    \stoptypescriptcollection
+
+\stopmode
+