1 files changed, 35 insertions, 47 deletions
diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv
index f5d237213..719512322 100644
--- a/tex/context/base/type-otf.mkiv
+++ b/tex/context/base/type-otf.mkiv
@@ -484,9 +484,6 @@
         \definefontsynonym [SerifBoldSlanted]     [SerifBoldItalic]
         \definefontsynonym [SerifCaps]            [\typescriptprefix{n:\typescripttwo}-Caps]
 
-        \definefontvariant [Serif][osf][Caps]
-        \definefontvariant [Serif][sc] [Caps]
-
         \definefontsynonym [SerifRegular]         [Serif]
         \definefontsynonym [SerifRegularCaps]     [SerifCaps]
         \definefontsynonym [SerifItalicCaps]      [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
@@ -521,9 +518,6 @@
         \definefontsynonym [SansBoldSlanted]     [SansBoldItalic]
         \definefontsynonym [SansCaps]            [\typescriptprefix{n:\typescripttwo}-Caps]
 
-        \definefontvariant [Sans][osf][Caps]
-        \definefontvariant [Sans][sc] [Caps]
-
         \definefontsynonym [SansRegular]         [Sans]
         \definefontsynonym [SansRegularCaps]     [SansCaps]
         \definefontsynonym [SansItalicCaps]      [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
@@ -542,9 +536,6 @@
         \definefontsynonym [MonoSlanted]         [MonoItalic]
         \definefontsynonym [MonoBoldSlanted]     [MonoBoldItalic]
 
-        \definefontvariant [Mono][osf][Caps]
-        \definefontvariant [Mono][sc] [Caps]
-
         \definefontsynonym [MonoRegular]         [Mono]
         \definefontsynonym [MonoRegularCaps]     [MonoCaps]
         \definefontsynonym [MonoItalicCaps]      [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
@@ -749,9 +740,6 @@
         \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-BoldItalicCap]
         \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-Cap]
 
-        \definefontvariant [Serif][osf][Caps]
-        \definefontvariant [Serif][sc] [Caps]
-
         \definefontsynonym [SerifRegularLight]     [AntykwaTorunska-Light]
         \definefontsynonym [SerifBoldLight]        [AntykwaTorunska-Medium]
         \definefontsynonym [SerifItalicLight]      [AntykwaTorunska-LightItalic]
@@ -760,8 +748,6 @@
         \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-MedItalic]
         \definefontsynonym [SerifCapsLight]        [AntykwaTorunska-LightCap]
 
-        \definefontvariant [Serif][lt][Light]
-
         \definefontsynonym [SerifRegularCond]     [AntykwaTorunska-CondRegular]
         \definefontsynonym [SerifBoldCond]        [AntykwaTorunska-CondBold]
         \definefontsynonym [SerifItalicCond]      [AntykwaTorunska-CondItalic]
@@ -769,9 +755,6 @@
         \definefontsynonym [SerifBoldItalicCond]  [AntykwaTorunska-CondBoldItalic]
         \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondBoldItalic]
         \definefontsynonym [SerifCapsCond]        [AntykwaTorunska-CondCap]
-
-        \definefontvariant [Serif][cond][Cond]
-
     \stoptypescript
 
     \starttypescript [serif] [antykwa-torunska-light] [name]
@@ -784,9 +767,6 @@
         \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-MedItalicCap]
         \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-LightCap]
 
-        \definefontvariant [Serif][osf][Caps]
-        \definefontvariant [Serif][sc] [Caps]
-
         \definefontsynonym [SerifRegularDark]     [AntykwaTorunska-Regular]
         \definefontsynonym [SerifBoldDark]        [AntykwaTorunska-Bold]
         \definefontsynonym [SerifItalicDark]      [AntykwaTorunska-Italic]
@@ -795,8 +775,6 @@
         \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-BoldItalic]
         \definefontsynonym [SerifCapsDark]        [AntykwaTorunska-Cap]
 
-        \definefontvariant [Serif][dk][Dark]
-
         \definefontsynonym [SerifRegularCond]     [AntykwaTorunska-CondLight]
         \definefontsynonym [SerifBoldCond]        [AntykwaTorunska-CondMedium]
         \definefontsynonym [SerifItalicCond]      [AntykwaTorunska-CondLightItalic]
@@ -804,9 +782,6 @@
         \definefontsynonym [SerifBoldItalicCond]  [AntykwaTorunska-CondMedItalic]
         \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondMedItalic]
         \definefontsynonym [SerifCapsCond]        [AntykwaTorunska-CondLightCap]
-
-        \definefontvariant [Serif][cond][Cond]
-
     \stoptypescript
 
     \starttypescript [serif] [antykwa-torunska-cond] [name]
@@ -819,9 +794,6 @@
         \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondBoldItalicCap]
         \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-CondCap]
 
-        \definefontvariant [Serif][osf][Caps]
-        \definefontvariant [Serif][sc] [Caps]
-
         \definefontsynonym [SerifRegularLight]     [AntykwaTorunska-CondLight]
         \definefontsynonym [SerifBoldLight]        [AntykwaTorunska-CondMedium]
         \definefontsynonym [SerifItalicLight]      [AntykwaTorunska-CondLightItalic]
@@ -830,8 +802,6 @@
         \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-CondMedItalic]
         \definefontsynonym [SerifCapsLight]        [AntykwaTorunska-CondLightCap]
 
-        \definefontvariant [Serif][lt][Light]
-
         \definefontsynonym [SerifRegularExp]     [AntykwaTorunska-Regular]
         \definefontsynonym [SerifBoldExp]        [AntykwaTorunska-Bold]
         \definefontsynonym [SerifItalicExp]      [AntykwaTorunska-Italic]
@@ -839,9 +809,6 @@
         \definefontsynonym [SerifBoldItalicExp]  [AntykwaTorunska-BoldItalic]
         \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-BoldItalic]
         \definefontsynonym [SerifCapsExp]        [AntykwaTorunska-Cap]
-
-        \definefontvariant [Serif][exp][Exp]
-
     \stoptypescript
 
     \starttypescript [serif] [antykwa-torunska-lightcond] [name]
@@ -854,9 +821,6 @@
         \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondMedItalicCap]
         \definefontsynonym [SerifCapsCaps]        [AntykwaTorunska-CondLightCap]
 
-        \definefontvariant [Serif][osf][Caps]
-        \definefontvariant [Serif][sc] [Caps]
-
         \definefontsynonym [SerifRegularDark]     [AntykwaTorunska-CondRegular]
         \definefontsynonym [SerifBoldDark]        [AntykwaTorunska-CondBold]
         \definefontsynonym [SerifItalicDark]      [AntykwaTorunska-CondItalic]
@@ -865,8 +829,6 @@
         \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-CondBoldItalic]
         \definefontsynonym [SerifCapsDark]        [AntykwaTorunska-CondCap]
 
-        \definefontvariant [Serif][dk][Dark]
-
         \definefontsynonym [SerifRegularExp]     [AntykwaTorunska-Light]
         \definefontsynonym [SerifBoldExp]        [AntykwaTorunska-Medium]
         \definefontsynonym [SerifItalicExp]      [AntykwaTorunska-LightItalic]
@@ -874,9 +836,6 @@
         \definefontsynonym [SerifBoldItalicExp]  [AntykwaTorunska-MedItalic]
         \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-MedItalic]
         \definefontsynonym [SerifCapsExp]        [AntykwaTorunska-LightCap]
-
-        \definefontvariant [Serif][exp][Exp]
-
     \stoptypescript
 
     \starttypescript [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond]
@@ -1678,12 +1637,37 @@
 
 \starttypescriptcollection[libertine]
 
+%     \starttypescript [serif] [libertine] [name]
+%         \setups[\s!font:\s!fallback:\s!serif]
+%         \definefontsynonym [\s!Serif]           [\s!file:fxlr.otf]  [\s!features=\s!default]
+%         \definefontsynonym [\s!SerifBold]       [\s!file:fxlb.otf]  [\s!features=\s!default]
+%         \definefontsynonym [\s!SerifItalic]     [\s!file:fxlri.otf] [\s!features=\s!default]
+%         \definefontsynonym [\s!SerifBoldItalic] [\s!file:fxlbi.otf] [\s!features=\s!default]
+%     \stoptypescript
+
+    \starttypescript [serif] [libertine]
+        \definefontsynonym [Libertine-Regular]    [\s!file:fxlr]
+        \definefontsynonym [Libertine-Italic]     [\s!file:fxlri]
+        \definefontsynonym [Libertine-Bold]       [\s!file:fxlb]
+        \definefontsynonym [Libertine-BoldItalic] [\s!file:fxlbi]
+        \definefontsynonym [Libertine-SmallCaps]  [file:fxlrc]
+    \stoptypescript
+
     \starttypescript [serif] [libertine] [name]
         \setups[\s!font:\s!fallback:\s!serif]
-        \definefontsynonym [\s!Serif]           [\s!file:fxlr.otf]  [\s!features=\s!default]
-        \definefontsynonym [\s!SerifBold]       [\s!file:fxlb.otf]  [\s!features=\s!default]
-        \definefontsynonym [\s!SerifItalic]     [\s!file:fxlri.otf] [\s!features=\s!default]
-        \definefontsynonym [\s!SerifBoldItalic] [\s!file:fxlbi.otf] [\s!features=\s!default]
+        \definefontsynonym [\s!Serif]           [Libertine-Regular]    [\s!features=\s!default]
+        \definefontsynonym [\s!SerifItalic]     [Libertine-Italic]     [\s!features=\s!default]
+      % \definefontsynonym [\s!SerifSlanted]    [Libertine-Italic]     [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBold]       [Libertine-Bold]       [\s!features=\s!default]
+        \definefontsynonym [\s!SerifBoldItalic] [Libertine-BoldItalic] [\s!features=\s!default]
+      % \definefontsynonym [\s!SerifBoldSlanted][Libertine-BoldItalic] [\s!features=\s!default]
+        \definefontsynonym [\s!SerifCaps]       [Libertine-SmallCaps]  [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [libertine]
+        \definetypeface [libertine] [tt] [mono]  [default]   [default]
+        \definetypeface [libertine] [ss] [sans]  [default]   [default]
+        \definetypeface [libertine] [rm] [serif] [libertine] [default]
     \stoptypescript
 
     \starttypescript [sans] [biolinum] [name]
@@ -1696,11 +1680,15 @@
 
 \stoptypescriptcollection
 
-\starttypescriptcollection[levien]
+\starttypescriptcollection[inconsolata]
+
+    \starttypescript [mono] [inconsolata]
+        \definefontsynonym [Inconsolata] [\s!file:inconsolata.otf]
+    \stoptypescript
 
     \starttypescript [mono] [inconsolata] [name]
         \setups[\s!font:\s!fallback:\s!mono]
-        \definefontsynonym [\s!Mono] [\s!file:inconsolata.otf]
+        \definefontsynonym [\s!Mono] [Inconsolata]
     \stoptypescript
 
 \stoptypescriptcollection