2016-06-19 13:35:00

3 files changed, 86 insertions, 12 deletions

diff --git a/tex/context/fonts/mkiv/minion-math.lfg b/tex/context/fonts/mkiv/minion-math.lfg
index a867a00e3..72bf7d436 100644
--- a/tex/context/fonts/mkiv/minion-math.lfg
+++ b/tex/context/fonts/mkiv/minion-math.lfg
@@ -14,6 +14,10 @@ return {
             ["9.8pt"] = "file:MinionMath-Capt.otf",
             default   = "file:MinionMath-Regular.otf",
         },
+        ["Minion-BoldMath"] = {
+            default   = "file:MinionMath-Semibold.otf",
+        ["Minion-MediumMath"] = {
+            default   = "file:MinionMath-Semibold.otf",
     },
     mathematics = {
         kerns = {
diff --git a/tex/context/fonts/mkiv/minion.lfg b/tex/context/fonts/mkiv/minion.lfg
new file mode 100644
index 000000000..84f01b6a9
--- /dev/null
+++ b/tex/context/fonts/mkiv/minion.lfg
@@ -0,0 +1,54 @@
+-- We just assume that Minion Pro is used. After all it's a commercial font so
+-- that is probably whey people will buy.
+
+return {
+    name = "minion",
+    version = "1.00",
+    comment = "Goodies that complement minion pro.",
+    author = "Hans Hagen and Mathias Schickel",
+    copyright = "ConTeXt development team",
+    designsizes = {
+        ["Minion-Regular"] = {
+            ["9.5pt"]  = "file:MinionPro-Capt.otf",
+            ["12.5pt"] = "file:MinionPro-Regular.otf",
+            ["14.5pt"] = "file:MinionPro-Subh.otf",
+            ["16pt"]   = "file:MinionPro-Disp.otf",
+            default    = "file:MinionPro-Regular.otf",
+        },
+        ["Minion-Italic"] = {
+            ["9.5pt"]  = "file:MinionPro-ItCapt.otf",
+            ["12.5pt"] = "file:MinionPro-It.otf",
+            ["14.5pt"] = "file:MinionPro-ItSubh.otf",
+            ["16pt"]   = "file:MinionPro-ItDisp.otf",
+            default    = "file:MinionPro-It.otf",
+        },
+        ["Minion-Bold"] = {
+            ["9.5pt"]  = "file:MinionPro-BoldCapt.otf",
+            ["12.5pt"] = "file:MinionPro-Bold.otf",
+            ["14.5pt"] = "file:MinionPro-BoldSubh.otf",
+            ["16pt"]   = "file:MinionPro-BoldDisp.otf",
+            default    = "file:MinionPro-Bold.otf",
+        },
+        ["Minion-BoldItalic"] = {
+            ["9.5pt"]  = "file:MinionPro-BoldItCapt.otf",
+            ["12.5pt"] = "file:MinionPro-BoldIt.otf",
+            ["14.5pt"] = "file:MinionPro-BoldItSubh.otf",
+            ["16pt"]   = "file:MinionPro-BoldItDisp.otf",
+            default    = "file:MinionPro-It.otf",
+        },
+        ["Minion-Medium"] = {
+            ["9.5pt"]  = "file:MinionPro-SemiboldCapt.otf",
+            ["12.5pt"] = "file:MinionPro-Semibold.otf",
+            ["14.5pt"] = "file:MinionPro-SemiboldSubh.otf",
+            ["16pt"]   = "file:MinionPro-SemiboldDisp.otf",
+            default    = "file:MinionPro-Semibold.otf",
+        },
+        ["Minion-MediumItalic"] = {
+            ["9.5pt"]  = "file:MinionPro-SemiboldItCapt.otf",
+            ["12.5pt"] = "file:MinionPro-SemiboldIt.otf",
+            ["14.5pt"] = "file:MinionPro-SemiboldItSubh.otf",
+            ["16pt"]   = "file:MinionPro-SemiboldItDisp.otf",
+            default    = "file:MinionPro-SemiboldIt.otf",
+        },
+    },
+}
diff --git a/tex/context/fonts/mkiv/type-imp-minion.mkiv b/tex/context/fonts/mkiv/type-imp-minion.mkiv
index a09bc6264..06bc842ac 100644
--- a/tex/context/fonts/mkiv/type-imp-minion.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-minion.mkiv
@@ -11,28 +11,44 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-
-\definefontfallback[MinionMathFallback][file:latinmodern-math.otf][uppercasescript]
+\definefontfallback[MinionMathFallback]    [file:latinmodern-math.otf][uppercasescript]
+\definefontfallback[MinionBoldMathFallback][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]
+        \loadfontgoodies[minion]
+        \definefontsynonym[\s!Serif]          [Minion-Regular]   [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifBold]      [Minion-Bold]      [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifItalic]    [Minion-Italic]    [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifBoldItalic][Minion-BoldItalic][\s!features=\s!default,\s!goodies=minion]
+    \stoptypescript
+
+    \starttypescript [\s!serif][minion-medium][\s!all]
+        \loadfontgoodies[minion]
+        \definefontsynonym[\s!Serif]          [Minion-Regular]     [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifBold]      [Minion-Medium]      [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifItalic]    [Minion-Italic]      [\s!features=\s!default,\s!goodies=minion]
+        \definefontsynonym[\s!SerifBoldItalic][Minion-MediumItalic][\s!features=\s!default,\s!goodies=minion]
     \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]
+        \definefontsynonym[\s!MathRoman]    [Minion-Math]    [\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
+        \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
+    \stoptypescript
+
+    \starttypescript [\s!math][minion-medium][\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]
+        \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
     \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]
+    \starttypescript [minion,minion-medium]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\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]  [\typescriptone] [\s!default]
     \stoptypescript
 
 \stoptypescriptcollection