2016-06-15 20:23:00

4 files changed, 101 insertions, 36 deletions

diff --git a/tex/context/fonts/mkiv/minion-math.lfg b/tex/context/fonts/mkiv/minion-math.lfg
new file mode 100644
index 000000000..a867a00e3
--- /dev/null
+++ b/tex/context/fonts/mkiv/minion-math.lfg
@@ -0,0 +1,24 @@
+local kern_100 = { bottomright = { { kern = -100 } } }
+local kern_150 = { bottomright = { { kern = -150 } } }
+local kern_200 = { bottomright = { { kern = -200 } } }
+
+return {
+    name = "minion-math",
+    version = "1.00",
+    comment = "Goodies that complement minion math.",
+    author = "Hans Hagen",
+    copyright = "ConTeXt development team",
+    designsizes = {
+        ["Minion-Math"] = {
+            ["8.4pt"] = "file:MinionMath-Tiny.otf",
+            ["9.8pt"] = "file:MinionMath-Capt.otf",
+            default   = "file:MinionMath-Regular.otf",
+        },
+    },
+    mathematics = {
+        kerns = {
+            [0x1D449] = kern_200, -- 𝑉
+            [0x1D44A] = kern_150, -- 𝑊
+        },
+    },
+}
diff --git a/tex/context/fonts/mkiv/type-imp-minion.mkiv b/tex/context/fonts/mkiv/type-imp-minion.mkiv
new file mode 100644
index 000000000..a09bc6264
--- /dev/null
+++ b/tex/context/fonts/mkiv/type-imp-minion.mkiv
@@ -0,0 +1,38 @@
+%D \module
+%D   [       file=type-imp-minion,
+%D        version=2016.06.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Minion,
+%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.
+
+
+\definefontfallback[MinionMathFallback][file:latinmodern-math.otf][uppercasescript]
+
+\starttypescriptcollection[minion]
+
+    \starttypescript [\s!serif][minion][\s!all]
+        \definefontsynonym[\s!Serif]          [\s!file:MinionPro-Regular.otf][\s!features=\s!default]
+        \definefontsynonym[\s!SerifBold]      [\s!file:MinionPro-Bold.otf]   [\s!features=\s!default]
+        \definefontsynonym[\s!SerifItalic]    [\s!file:MinionPro-It.otf]     [\s!features=\s!default]
+        \definefontsynonym[\s!SerifBoldItalic][\s!file:MinionPro-BoldIt.otf] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!math][minion][\s!all]
+        \loadfontgoodies[minion-math]
+        \definefontsynonym[\s!MathRoman][Minion-Math][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
+    \stoptypescript
+
+    \starttypescript [minion]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [minion] [\s!default]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [dejavu] [\s!default] [\s!rscale=0.8]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu] [\s!default] [\s!rscale=0.8]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [minion] [\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 e617a2505..64861a6ef 100644
--- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -215,6 +215,22 @@
 
 \stoptypescriptcollection
 
+% tricky: we cannot mix now as the file is loaded only once
+
+\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]
@@ -229,6 +245,20 @@
 
 \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]
@@ -263,31 +293,4 @@
 
 \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
 
diff --git a/tex/context/fonts/mkiv/xits-math.lfg b/tex/context/fonts/mkiv/xits-math.lfg
index 8e1274365..dd09dd0f1 100644
--- a/tex/context/fonts/mkiv/xits-math.lfg
+++ b/tex/context/fonts/mkiv/xits-math.lfg
@@ -28,15 +28,15 @@ return {
      --     ["xits-math"] = italics,
      -- },
         alternates = {
-            cal       = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" },
-            greekssup = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" },
-            greekssit = { feature = 'ss03', value = 1, comment = "Mathematical Italic Sans Serif Digits" },
-            monobfnum = { feature = 'ss04', value = 1, comment = "Mathematical Bold Monospace Digits" },
-            mathbbbf  = { feature = 'ss05', value = 1, comment = "Mathematical Bold Double-Struck Alphabet" },
-            mathbbit  = { feature = 'ss06', value = 1, comment = "Mathematical Italic Double-Struck Alphabet" },
-            mathbbbi  = { feature = 'ss07', value = 1, comment = "Mathematical Bold Italic Double-Struck Alphabet" },
-            upint     = { feature = 'ss08', value = 1, comment = "Upright Integrals" },
-            vertnot   = { feature = 'ss09', value = 1, comment = "Negated Symbols With Vertical Stroke" },
+            calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Calligraphic Alphabet" },
+            greekssup    = { feature = 'ss02', value = 1, comment = "Mathematical Greek Sans Serif Alphabet" },
+            greekssit    = { feature = 'ss03', value = 1, comment = "Mathematical Italic Sans Serif Digits" },
+            monobfnum    = { feature = 'ss04', value = 1, comment = "Mathematical Bold Monospace Digits" },
+            mathbbbf     = { feature = 'ss05', value = 1, comment = "Mathematical Bold Double-Struck Alphabet" },
+            mathbbit     = { feature = 'ss06', value = 1, comment = "Mathematical Italic Double-Struck Alphabet" },
+            mathbbbi     = { feature = 'ss07', value = 1, comment = "Mathematical Bold Italic Double-Struck Alphabet" },
+            upint        = { feature = 'ss08', value = 1, comment = "Upright Integrals" },
+            vertnot      = { feature = 'ss09', value = 1, comment = "Negated Symbols With Vertical Stroke" },
         },
     }
 }