1 files changed, 164 insertions, 89 deletions
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TOsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TOsF.fd
index 26727d6f171..0f6220b81b4 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-TOsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-TOsF.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-TOsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-TOsF}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-t1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/eb/it
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{light}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{black}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-swash-t1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/mb/it
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-t1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{n}{
+      <-> ssub * CrimsonPro-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{it}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{sl}{
-      <-> ssub * CrimsonPro-TOsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-t1
+      <-> ssub * CrimsonPro-TOsF/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-t1
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-swash-t1
+%   sl --> regular
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{l}{sl}{
-      <-> ssub * CrimsonPro-TOsF/l/it
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sl}{n}{
+      <-> ssub * CrimsonPro-TOsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sl}{it}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-t1
+
+%   m --> medium
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{n}{
+      <-> ssub * CrimsonPro-TOsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{m}{it}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{k}{sl}{
-      <-> ssub * CrimsonPro-TOsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{n}{
+      <-> ssub * CrimsonPro-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{sb}{it}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-swash-t1
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{n}{
+      <-> ssub * CrimsonPro-TOsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/it
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{b}{it}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-t1
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{n}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{eb}{it}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-swash-t1
+
+%   ub --> black
+
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{el}{sl}{
-      <-> ssub * CrimsonPro-TOsF/el/it
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{ub}{n}{
+      <-> ssub * CrimsonPro-TOsF/black/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/sl
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{ub}{it}{
+      <-> ssub * CrimsonPro-TOsF/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{n}{
       <-> ssub * CrimsonPro-TOsF/b/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{it}{
-      <-> ssub * CrimsonPro-TOsF/b/it
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TOsF/b/sw
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-TOsF/b/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TOsF/b/nw
+\DeclareFontShape{T1}{CrimsonPro-TOsF}{bx}{it}{
+      <-> ssub * CrimsonPro-TOsF/b/it
 }{}
 
 \endinput