crimsonpro (16oct19)

git-svn-id: svn://tug.org/texlive/trunk@52407 c570f23f-e606-0410-a88d-b1316a301751

23 files changed, 3685 insertions, 1962 deletions

diff --git a/Master/texmf-dist/tex/latex/crimsonpro/CrimsonPro.sty b/Master/texmf-dist/tex/latex/crimsonpro/CrimsonPro.sty
index 23674fe0536..190dbcb689d 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/CrimsonPro.sty
+++ b/Master/texmf-dist/tex/latex/crimsonpro/CrimsonPro.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{CrimsonPro}
-    [2018/12/18 (Bob Tennent and autoinst)  Style file for CrimsonPro fonts.]
+    [2019/10/15 (Bob Tennent and autoinst)  Style file for CrimsonPro fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -93,20 +93,21 @@
     \def\crimsonpro@figurealign{}
   \fi
   \ifcrimsonpro@medium
-    \def\mdseries@rm{mb}
+    \def\mdseries@rm{m}
   \else\ifcrimsonpro@light
     \def\mdseries@rm{l}
   \else\ifcrimsonpro@extralight
     \def\mdseries@rm{el}
   \else
-    \def\mdseries@rm{m}
+    \def\mdseries@rm{sl}
   \fi\fi\fi
+  \def\seriesdefault{\mdseries@rm}
   \ifcrimsonpro@semibold
     \def\bfseries@rm{sb}
   \else\ifcrimsonpro@extrabold
     \def\bfseries@rm{eb}
   \else\ifcrimsonpro@black
-    \def\bfseries@rm{k}
+    \def\bfseries@rm{ub}
   \else
     \def\bfseries@rm{b}
   \fi\fi\fi
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Inf.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Inf.fd
index 7500be0d617..8e167139417 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Inf.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-Inf.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-Inf.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-Inf.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-Inf}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{sl}{
-      <-> ssub * CrimsonPro-Inf/eb/it
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{regular}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{sl}{
-      <-> ssub * CrimsonPro-Inf/sb/it
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{bold}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{light}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{black}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{mb}{sl}{
-      <-> ssub * CrimsonPro-Inf/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{medium}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-ly1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{sl}{
-      <-> ssub * CrimsonPro-Inf/m/it
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{n}{
+      <-> ssub * CrimsonPro-Inf/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{it}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{l}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-ly1
+      <-> ssub * CrimsonPro-Inf/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-ly1
+      <-> ssub * CrimsonPro-Inf/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{l}{sl}{
-      <-> ssub * CrimsonPro-Inf/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sl}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sl}{n}{
+      <-> ssub * CrimsonPro-Inf/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sl}{it}{
+      <-> ssub * CrimsonPro-Inf/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{n}{
+      <-> ssub * CrimsonPro-Inf/medium/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{m}{it}{
+      <-> ssub * CrimsonPro-Inf/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{k}{sl}{
-      <-> ssub * CrimsonPro-Inf/k/it
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{n}{
+      <-> ssub * CrimsonPro-Inf/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{sb}{it}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{b}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-ly1
+      <-> ssub * CrimsonPro-Inf/bold/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-ly1
+      <-> ssub * CrimsonPro-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{b}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{n}{
+      <-> ssub * CrimsonPro-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{eb}{it}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{el}{sl}{
-      <-> ssub * CrimsonPro-Inf/el/it
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{ub}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Inf}{bx}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/sl
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{ub}{n}{
+      <-> ssub * CrimsonPro-Inf/black/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{ub}{it}{
+      <-> ssub * CrimsonPro-Inf/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{bx}{n}{
       <-> ssub * CrimsonPro-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{CrimsonPro-Inf}{bx}{sl}{
+      <-> ssub * CrimsonPro-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CrimsonPro-Inf}{bx}{it}{
       <-> ssub * CrimsonPro-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-LF.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-LF.fd
index 80e11661ca1..8484c9f099d 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-LF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-LF.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-LF.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-LF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-LF}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{regular}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-titling-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{sl}{
-      <-> ssub * CrimsonPro-LF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/eb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{bold}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-ly1
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{light}{sl}{
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-titling-ly1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{sl}{
-      <-> ssub * CrimsonPro-LF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/sb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{black}{sl}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-LF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-LF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{medium}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-swash-ly1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{sl}{
-      <-> ssub * CrimsonPro-LF/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/mb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ly1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ly1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{n}{
+      <-> ssub * CrimsonPro-LF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{it}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{sl}{
-      <-> ssub * CrimsonPro-LF/m/it
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-LF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{sl}{
+      <-> ssub * CrimsonPro-LF/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-LF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ly1
+      <-> ssub * CrimsonPro-LF/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-LF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ly1
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-titling-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-swash-ly1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sl}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{sl}{
-      <-> ssub * CrimsonPro-LF/l/it
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sl}{n}{
+      <-> ssub * CrimsonPro-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-LF/l/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sl}{it}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-titling-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ly1
-}{}
+%   m --> medium
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{n}{
+      <-> ssub * CrimsonPro-LF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{m}{it}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{sl}{
-      <-> ssub * CrimsonPro-LF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-LF/k/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{n}{
+      <-> ssub * CrimsonPro-LF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{sb}{it}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-titling-ly1
-}{}
+%   b --> bold
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{n}{
+      <-> ssub * CrimsonPro-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{sl}{
-      <-> ssub * CrimsonPro-LF/b/it
+\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{it}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-titling-ly1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{n}{
+      <-> ssub * CrimsonPro-LF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-LF}{eb}{it}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-swash-ly1
-}{}
+%   ub --> black
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{sl}{
-      <-> ssub * CrimsonPro-LF/el/it
+\DeclareFontShape{LY1}{CrimsonPro-LF}{ub}{sl}{
+      <-> ssub * CrimsonPro-LF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-LF/el/tlit
+\DeclareFontShape{LY1}{CrimsonPro-LF}{ub}{n}{
+      <-> ssub * CrimsonPro-LF/black/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{tl}{
-      <-> ssub * CrimsonPro-LF/b/tl
+\DeclareFontShape{LY1}{CrimsonPro-LF}{ub}{it}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{n}{
       <-> ssub * CrimsonPro-LF/b/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{it}{
-      <-> ssub * CrimsonPro-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{sw}{
-      <-> ssub * CrimsonPro-LF/b/sw
-}{}
-
 \DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{sl}{
       <-> ssub * CrimsonPro-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlsl
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{nw}{
-      <-> ssub * CrimsonPro-LF/b/nw
+\DeclareFontShape{LY1}{CrimsonPro-LF}{bx}{it}{
+      <-> ssub * CrimsonPro-LF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-OsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-OsF.fd
index f52b0d17ba7..591a4cd92cb 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-OsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-OsF.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-OsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-OsF}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ly1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-OsF/eb/it
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-OsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{light}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{black}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-swash-ly1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-OsF/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ly1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{n}{
+      <-> ssub * CrimsonPro-OsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{it}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{sl}{
-      <-> ssub * CrimsonPro-OsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ly1
+      <-> ssub * CrimsonPro-OsF/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ly1
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-swash-ly1
+%   sl --> regular
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{l}{sl}{
-      <-> ssub * CrimsonPro-OsF/l/it
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sl}{n}{
+      <-> ssub * CrimsonPro-OsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sl}{it}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ly1
+
+%   m --> medium
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{n}{
+      <-> ssub * CrimsonPro-OsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{m}{it}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{k}{sl}{
-      <-> ssub * CrimsonPro-OsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{n}{
+      <-> ssub * CrimsonPro-OsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{sb}{it}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-swash-ly1
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{n}{
+      <-> ssub * CrimsonPro-OsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/it
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{b}{it}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ly1
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{n}{
+      <-> ssub * CrimsonPro-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{eb}{it}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-swash-ly1
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{el}{sl}{
-      <-> ssub * CrimsonPro-OsF/el/it
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{ub}{n}{
+      <-> ssub * CrimsonPro-OsF/black/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/sl
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{ub}{it}{
+      <-> ssub * CrimsonPro-OsF/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{n}{
       <-> ssub * CrimsonPro-OsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{it}{
-      <-> ssub * CrimsonPro-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-OsF/b/sw
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-OsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-OsF/b/nw
+\DeclareFontShape{LY1}{CrimsonPro-OsF}{bx}{it}{
+      <-> ssub * CrimsonPro-OsF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Sup.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Sup.fd
index 7aa14545cd3..1d677bae35d 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Sup.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-Sup.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-Sup.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-Sup.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-Sup}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{sl}{
-      <-> ssub * CrimsonPro-Sup/eb/it
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{regular}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{sl}{
-      <-> ssub * CrimsonPro-Sup/sb/it
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{bold}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{light}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{black}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{mb}{sl}{
-      <-> ssub * CrimsonPro-Sup/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{medium}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-ly1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{sl}{
-      <-> ssub * CrimsonPro-Sup/m/it
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{n}{
+      <-> ssub * CrimsonPro-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{it}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{l}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-ly1
+      <-> ssub * CrimsonPro-Sup/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-ly1
+      <-> ssub * CrimsonPro-Sup/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{l}{sl}{
-      <-> ssub * CrimsonPro-Sup/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sl}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sl}{n}{
+      <-> ssub * CrimsonPro-Sup/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sl}{it}{
+      <-> ssub * CrimsonPro-Sup/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{n}{
+      <-> ssub * CrimsonPro-Sup/medium/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{m}{it}{
+      <-> ssub * CrimsonPro-Sup/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{k}{sl}{
-      <-> ssub * CrimsonPro-Sup/k/it
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{n}{
+      <-> ssub * CrimsonPro-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{sb}{it}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{b}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-ly1
+      <-> ssub * CrimsonPro-Sup/bold/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-ly1
+      <-> ssub * CrimsonPro-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{b}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{n}{
+      <-> ssub * CrimsonPro-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-ly1
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{eb}{it}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{el}{sl}{
-      <-> ssub * CrimsonPro-Sup/el/it
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{ub}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-Sup}{bx}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/sl
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{ub}{n}{
+      <-> ssub * CrimsonPro-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{ub}{it}{
+      <-> ssub * CrimsonPro-Sup/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{bx}{n}{
       <-> ssub * CrimsonPro-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{CrimsonPro-Sup}{bx}{sl}{
+      <-> ssub * CrimsonPro-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CrimsonPro-Sup}{bx}{it}{
       <-> ssub * CrimsonPro-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TLF.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TLF.fd
index f40bfbc86d1..b83e6cd512b 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-TLF.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-TLF.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-TLF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-TLF}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-titling-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TLF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/eb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-ly1
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{light}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-titling-ly1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TLF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/sb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{black}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-swash-ly1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TLF/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/mb/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ly1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ly1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{n}{
+      <-> ssub * CrimsonPro-TLF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{it}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{sl}{
-      <-> ssub * CrimsonPro-TLF/m/it
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ly1
+      <-> ssub * CrimsonPro-TLF/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ly1
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-titling-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-swash-ly1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{sl}{
-      <-> ssub * CrimsonPro-TLF/l/it
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sl}{n}{
+      <-> ssub * CrimsonPro-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/l/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sl}{it}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-titling-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ly1
-}{}
+%   m --> medium
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{n}{
+      <-> ssub * CrimsonPro-TLF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{m}{it}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{sl}{
-      <-> ssub * CrimsonPro-TLF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/k/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{n}{
+      <-> ssub * CrimsonPro-TLF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{sb}{it}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-titling-ly1
-}{}
+%   b --> bold
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{n}{
+      <-> ssub * CrimsonPro-TLF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{sl}{
-      <-> ssub * CrimsonPro-TLF/b/it
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{it}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-titling-ly1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{n}{
+      <-> ssub * CrimsonPro-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-titling-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{eb}{it}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-swash-ly1
-}{}
+%   ub --> black
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{sl}{
-      <-> ssub * CrimsonPro-TLF/el/it
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/el/tlit
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{ub}{n}{
+      <-> ssub * CrimsonPro-TLF/black/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{tl}{
-      <-> ssub * CrimsonPro-TLF/b/tl
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{ub}{it}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{n}{
       <-> ssub * CrimsonPro-TLF/b/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{it}{
-      <-> ssub * CrimsonPro-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TLF/b/sw
-}{}
-
 \DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{sl}{
       <-> ssub * CrimsonPro-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlsl
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TLF/b/nw
+\DeclareFontShape{LY1}{CrimsonPro-TLF}{bx}{it}{
+      <-> ssub * CrimsonPro-TLF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TOsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TOsF.fd
index b3290f4fcde..8310ab2d9e8 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/LY1CrimsonPro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{LY1CrimsonPro-TOsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for LY1/CrimsonPro-TOsF.]
+    [2019/10/15 (autoinst)  Font definitions for LY1/CrimsonPro-TOsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{LY1}{CrimsonPro-TOsF}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ly1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/eb/it
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{light}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{black}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-swash-ly1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/mb/it
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ly1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{n}{
+      <-> ssub * CrimsonPro-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{it}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{sl}{
-      <-> ssub * CrimsonPro-TOsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/sl
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ly1
+      <-> ssub * CrimsonPro-TOsF/light/n
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ly1
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-swash-ly1
-}{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-swash-ly1
+%   sl --> regular
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{l}{sl}{
-      <-> ssub * CrimsonPro-TOsF/l/it
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sl}{n}{
+      <-> ssub * CrimsonPro-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sl}{it}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ly1
+
+%   m --> medium
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{n}{
+      <-> ssub * CrimsonPro-TOsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{m}{it}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{k}{sl}{
-      <-> ssub * CrimsonPro-TOsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{n}{
+      <-> ssub * CrimsonPro-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{sb}{it}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-swash-ly1
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{n}{
+      <-> ssub * CrimsonPro-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/it
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{b}{it}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ly1
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{n}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{eb}{it}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-swash-ly1
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{el}{sl}{
-      <-> ssub * CrimsonPro-TOsF/el/it
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{ub}{n}{
+      <-> ssub * CrimsonPro-TOsF/black/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/sl
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{ub}{it}{
+      <-> ssub * CrimsonPro-TOsF/black/it
 }{}
 
 \DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{n}{
       <-> ssub * CrimsonPro-TOsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{it}{
-      <-> ssub * CrimsonPro-TOsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TOsF/b/sw
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-TOsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TOsF/b/nw
+\DeclareFontShape{LY1}{CrimsonPro-TOsF}{bx}{it}{
+      <-> ssub * CrimsonPro-TOsF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Inf.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Inf.fd
index d842c99c590..2273521cf06 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Inf.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-Inf.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-Inf.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-Inf.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-Inf}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{sl}{
-      <-> ssub * CrimsonPro-Inf/eb/it
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{regular}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{sl}{
-      <-> ssub * CrimsonPro-Inf/sb/it
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{bold}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{light}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{black}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{mb}{sl}{
-      <-> ssub * CrimsonPro-Inf/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{medium}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-ot1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{sl}{
-      <-> ssub * CrimsonPro-Inf/m/it
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{n}{
+      <-> ssub * CrimsonPro-Inf/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{it}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{l}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-ot1
+      <-> ssub * CrimsonPro-Inf/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-ot1
+      <-> ssub * CrimsonPro-Inf/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{l}{sl}{
-      <-> ssub * CrimsonPro-Inf/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sl}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sl}{n}{
+      <-> ssub * CrimsonPro-Inf/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sl}{it}{
+      <-> ssub * CrimsonPro-Inf/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/sl
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{n}{
+      <-> ssub * CrimsonPro-Inf/medium/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{m}{it}{
+      <-> ssub * CrimsonPro-Inf/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{k}{sl}{
-      <-> ssub * CrimsonPro-Inf/k/it
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{n}{
+      <-> ssub * CrimsonPro-Inf/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{sb}{it}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{b}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-ot1
+      <-> ssub * CrimsonPro-Inf/bold/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-ot1
+      <-> ssub * CrimsonPro-Inf/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{b}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{n}{
+      <-> ssub * CrimsonPro-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{eb}{it}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{el}{sl}{
-      <-> ssub * CrimsonPro-Inf/el/it
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{ub}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Inf}{bx}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/sl
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{ub}{n}{
+      <-> ssub * CrimsonPro-Inf/black/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{ub}{it}{
+      <-> ssub * CrimsonPro-Inf/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{bx}{n}{
       <-> ssub * CrimsonPro-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{CrimsonPro-Inf}{bx}{sl}{
+      <-> ssub * CrimsonPro-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CrimsonPro-Inf}{bx}{it}{
       <-> ssub * CrimsonPro-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-LF.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-LF.fd
index cab92eef788..e8350a0f210 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-LF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-LF.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-LF.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-LF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-LF}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{regular}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-titling-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{sl}{
-      <-> ssub * CrimsonPro-LF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/eb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{bold}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-ot1
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{light}{sl}{
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-titling-ot1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{sl}{
-      <-> ssub * CrimsonPro-LF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/sb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{black}{sl}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-LF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-LF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{medium}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-swash-ot1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{sl}{
-      <-> ssub * CrimsonPro-LF/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/mb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ot1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ot1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{n}{
+      <-> ssub * CrimsonPro-LF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{it}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{sl}{
-      <-> ssub * CrimsonPro-LF/m/it
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-LF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{sl}{
+      <-> ssub * CrimsonPro-LF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-LF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ot1
+      <-> ssub * CrimsonPro-LF/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-LF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ot1
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-titling-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-swash-ot1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sl}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{sl}{
-      <-> ssub * CrimsonPro-LF/l/it
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sl}{n}{
+      <-> ssub * CrimsonPro-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-LF/l/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sl}{it}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-titling-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ot1
-}{}
+%   m --> medium
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{n}{
+      <-> ssub * CrimsonPro-LF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{m}{it}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{sl}{
-      <-> ssub * CrimsonPro-LF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-LF/k/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{n}{
+      <-> ssub * CrimsonPro-LF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{sb}{it}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-titling-ot1
-}{}
+%   b --> bold
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{n}{
+      <-> ssub * CrimsonPro-LF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{sl}{
-      <-> ssub * CrimsonPro-LF/b/it
+\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{it}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-titling-ot1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{n}{
+      <-> ssub * CrimsonPro-LF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-LF}{eb}{it}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-swash-ot1
-}{}
+%   ub --> black
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{sl}{
-      <-> ssub * CrimsonPro-LF/el/it
+\DeclareFontShape{OT1}{CrimsonPro-LF}{ub}{sl}{
+      <-> ssub * CrimsonPro-LF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-LF/el/tlit
+\DeclareFontShape{OT1}{CrimsonPro-LF}{ub}{n}{
+      <-> ssub * CrimsonPro-LF/black/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{tl}{
-      <-> ssub * CrimsonPro-LF/b/tl
+\DeclareFontShape{OT1}{CrimsonPro-LF}{ub}{it}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{n}{
       <-> ssub * CrimsonPro-LF/b/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{it}{
-      <-> ssub * CrimsonPro-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{sw}{
-      <-> ssub * CrimsonPro-LF/b/sw
-}{}
-
 \DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{sl}{
       <-> ssub * CrimsonPro-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlsl
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{nw}{
-      <-> ssub * CrimsonPro-LF/b/nw
+\DeclareFontShape{OT1}{CrimsonPro-LF}{bx}{it}{
+      <-> ssub * CrimsonPro-LF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-OsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-OsF.fd
index f645940041f..9452ec97b7a 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-OsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-OsF.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-OsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-OsF}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ot1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-OsF/eb/it
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-OsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{light}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{black}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-swash-ot1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-OsF/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ot1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{n}{
+      <-> ssub * CrimsonPro-OsF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{it}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{sl}{
-      <-> ssub * CrimsonPro-OsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ot1
+      <-> ssub * CrimsonPro-OsF/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ot1
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-swash-ot1
+%   sl --> regular
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{l}{sl}{
-      <-> ssub * CrimsonPro-OsF/l/it
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sl}{n}{
+      <-> ssub * CrimsonPro-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sl}{it}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ot1
+
+%   m --> medium
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{n}{
+      <-> ssub * CrimsonPro-OsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{m}{it}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{k}{sl}{
-      <-> ssub * CrimsonPro-OsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{n}{
+      <-> ssub * CrimsonPro-OsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{sb}{it}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-swash-ot1
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{n}{
+      <-> ssub * CrimsonPro-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/it
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{b}{it}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ot1
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{n}{
+      <-> ssub * CrimsonPro-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{eb}{it}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-swash-ot1
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{el}{sl}{
-      <-> ssub * CrimsonPro-OsF/el/it
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{ub}{n}{
+      <-> ssub * CrimsonPro-OsF/black/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/sl
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{ub}{it}{
+      <-> ssub * CrimsonPro-OsF/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{n}{
       <-> ssub * CrimsonPro-OsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{it}{
-      <-> ssub * CrimsonPro-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-OsF/b/sw
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-OsF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-OsF/b/nw
+\DeclareFontShape{OT1}{CrimsonPro-OsF}{bx}{it}{
+      <-> ssub * CrimsonPro-OsF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Sup.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Sup.fd
index f89f32f50af..4c0c2a09444 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Sup.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-Sup.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-Sup.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-Sup.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-Sup}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{sl}{
-      <-> ssub * CrimsonPro-Sup/eb/it
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{regular}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{sl}{
-      <-> ssub * CrimsonPro-Sup/sb/it
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{bold}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{light}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{black}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{mb}{sl}{
-      <-> ssub * CrimsonPro-Sup/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{medium}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-ot1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{sl}{
-      <-> ssub * CrimsonPro-Sup/m/it
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{n}{
+      <-> ssub * CrimsonPro-Sup/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{it}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{l}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-ot1
+      <-> ssub * CrimsonPro-Sup/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-ot1
+      <-> ssub * CrimsonPro-Sup/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{l}{sl}{
-      <-> ssub * CrimsonPro-Sup/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sl}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sl}{n}{
+      <-> ssub * CrimsonPro-Sup/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sl}{it}{
+      <-> ssub * CrimsonPro-Sup/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/sl
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{n}{
+      <-> ssub * CrimsonPro-Sup/medium/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{m}{it}{
+      <-> ssub * CrimsonPro-Sup/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{k}{sl}{
-      <-> ssub * CrimsonPro-Sup/k/it
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{n}{
+      <-> ssub * CrimsonPro-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{sb}{it}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{b}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-ot1
+      <-> ssub * CrimsonPro-Sup/bold/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-ot1
+      <-> ssub * CrimsonPro-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{b}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{n}{
+      <-> ssub * CrimsonPro-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-ot1
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{eb}{it}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{el}{sl}{
-      <-> ssub * CrimsonPro-Sup/el/it
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{ub}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-Sup}{bx}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/sl
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{ub}{n}{
+      <-> ssub * CrimsonPro-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{ub}{it}{
+      <-> ssub * CrimsonPro-Sup/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{bx}{n}{
       <-> ssub * CrimsonPro-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{CrimsonPro-Sup}{bx}{sl}{
+      <-> ssub * CrimsonPro-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CrimsonPro-Sup}{bx}{it}{
       <-> ssub * CrimsonPro-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TLF.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TLF.fd
index cdaa632c077..6395c01d0c9 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-TLF.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-TLF.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-TLF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-TLF}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-titling-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TLF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/eb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-ot1
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{light}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-titling-ot1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TLF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/sb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{black}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-swash-ot1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TLF/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/mb/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ot1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ot1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{n}{
+      <-> ssub * CrimsonPro-TLF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{it}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{sl}{
-      <-> ssub * CrimsonPro-TLF/m/it
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ot1
+      <-> ssub * CrimsonPro-TLF/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ot1
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-titling-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-swash-ot1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{sl}{
-      <-> ssub * CrimsonPro-TLF/l/it
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sl}{n}{
+      <-> ssub * CrimsonPro-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/l/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sl}{it}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-titling-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ot1
-}{}
+%   m --> medium
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{n}{
+      <-> ssub * CrimsonPro-TLF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{m}{it}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{sl}{
-      <-> ssub * CrimsonPro-TLF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/k/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{n}{
+      <-> ssub * CrimsonPro-TLF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{sb}{it}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-titling-ot1
-}{}
+%   b --> bold
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{n}{
+      <-> ssub * CrimsonPro-TLF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{sl}{
-      <-> ssub * CrimsonPro-TLF/b/it
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{it}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-titling-ot1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{n}{
+      <-> ssub * CrimsonPro-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-titling-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{eb}{it}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-swash-ot1
-}{}
+%   ub --> black
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{sl}{
-      <-> ssub * CrimsonPro-TLF/el/it
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/el/tlit
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{ub}{n}{
+      <-> ssub * CrimsonPro-TLF/black/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{tl}{
-      <-> ssub * CrimsonPro-TLF/b/tl
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{ub}{it}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{n}{
       <-> ssub * CrimsonPro-TLF/b/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{it}{
-      <-> ssub * CrimsonPro-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TLF/b/sw
-}{}
-
 \DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{sl}{
       <-> ssub * CrimsonPro-TLF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlsl
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TLF/b/nw
+\DeclareFontShape{OT1}{CrimsonPro-TLF}{bx}{it}{
+      <-> ssub * CrimsonPro-TLF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TOsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TOsF.fd
index 7fc7e6c2c93..11fa995b0d9 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/OT1CrimsonPro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{OT1CrimsonPro-TOsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for OT1/CrimsonPro-TOsF.]
+    [2019/10/15 (autoinst)  Font definitions for OT1/CrimsonPro-TOsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{OT1}{CrimsonPro-TOsF}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ot1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/eb/it
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{light}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{black}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-swash-ot1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/mb/it
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ot1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{n}{
+      <-> ssub * CrimsonPro-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{it}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{sl}{
-      <-> ssub * CrimsonPro-TOsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ot1
+      <-> ssub * CrimsonPro-TOsF/light/n
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ot1
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-swash-ot1
-}{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-swash-ot1
+%   sl --> regular
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{l}{sl}{
-      <-> ssub * CrimsonPro-TOsF/l/it
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sl}{n}{
+      <-> ssub * CrimsonPro-TOsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sl}{it}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ot1
+
+%   m --> medium
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{n}{
+      <-> ssub * CrimsonPro-TOsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{m}{it}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{k}{sl}{
-      <-> ssub * CrimsonPro-TOsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{n}{
+      <-> ssub * CrimsonPro-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{sb}{it}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-swash-ot1
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{n}{
+      <-> ssub * CrimsonPro-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/it
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{b}{it}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ot1
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{n}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{eb}{it}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-swash-ot1
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{el}{sl}{
-      <-> ssub * CrimsonPro-TOsF/el/it
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{ub}{n}{
+      <-> ssub * CrimsonPro-TOsF/black/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/sl
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{ub}{it}{
+      <-> ssub * CrimsonPro-TOsF/black/it
 }{}
 
 \DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{n}{
       <-> ssub * CrimsonPro-TOsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{it}{
-      <-> ssub * CrimsonPro-TOsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TOsF/b/sw
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-TOsF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TOsF/b/nw
+\DeclareFontShape{OT1}{CrimsonPro-TOsF}{bx}{it}{
+      <-> ssub * CrimsonPro-TOsF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Inf.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Inf.fd
index f336f5a888e..4e5012a8251 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Inf.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-Inf.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-Inf.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-Inf.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-Inf}{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{sl}{
-      <-> ssub * CrimsonPro-Inf/eb/it
+\DeclareFontShape{T1}{CrimsonPro-Inf}{regular}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-Inf}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{sl}{
-      <-> ssub * CrimsonPro-Inf/sb/it
+\DeclareFontShape{T1}{CrimsonPro-Inf}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{bold}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{light}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{black}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-Inf}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{mb}{sl}{
-      <-> ssub * CrimsonPro-Inf/mb/it
+\DeclareFontShape{T1}{CrimsonPro-Inf}{medium}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-inf-t1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{sl}{
-      <-> ssub * CrimsonPro-Inf/m/it
+\DeclareFontShape{T1}{CrimsonPro-Inf}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{sl}{
+      <-> ssub * CrimsonPro-Inf/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{n}{
+      <-> ssub * CrimsonPro-Inf/extralight/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{it}{
+      <-> ssub * CrimsonPro-Inf/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{l}{sl}{
+      <-> ssub * CrimsonPro-Inf/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Inf}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-inf-t1
+      <-> ssub * CrimsonPro-Inf/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Inf}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-inf-t1
+      <-> ssub * CrimsonPro-Inf/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{l}{sl}{
-      <-> ssub * CrimsonPro-Inf/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sl}{sl}{
+      <-> ssub * CrimsonPro-Inf/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sl}{n}{
+      <-> ssub * CrimsonPro-Inf/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sl}{it}{
+      <-> ssub * CrimsonPro-Inf/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{sl}{
+      <-> ssub * CrimsonPro-Inf/medium/sl
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{n}{
+      <-> ssub * CrimsonPro-Inf/medium/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{m}{it}{
+      <-> ssub * CrimsonPro-Inf/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{sl}{
+      <-> ssub * CrimsonPro-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{k}{sl}{
-      <-> ssub * CrimsonPro-Inf/k/it
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{n}{
+      <-> ssub * CrimsonPro-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{sb}{it}{
+      <-> ssub * CrimsonPro-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{b}{sl}{
+      <-> ssub * CrimsonPro-Inf/bold/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Inf}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-inf-t1
+      <-> ssub * CrimsonPro-Inf/bold/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Inf}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-inf-t1
+      <-> ssub * CrimsonPro-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{b}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{sl}{
+      <-> ssub * CrimsonPro-Inf/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{n}{
+      <-> ssub * CrimsonPro-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-inf-t1
+\DeclareFontShape{T1}{CrimsonPro-Inf}{eb}{it}{
+      <-> ssub * CrimsonPro-Inf/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{el}{sl}{
-      <-> ssub * CrimsonPro-Inf/el/it
+
+%   ub --> black
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{ub}{sl}{
+      <-> ssub * CrimsonPro-Inf/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Inf}{bx}{sl}{
-      <-> ssub * CrimsonPro-Inf/b/sl
+\DeclareFontShape{T1}{CrimsonPro-Inf}{ub}{n}{
+      <-> ssub * CrimsonPro-Inf/black/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Inf}{ub}{it}{
+      <-> ssub * CrimsonPro-Inf/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Inf}{bx}{n}{
       <-> ssub * CrimsonPro-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{CrimsonPro-Inf}{bx}{sl}{
+      <-> ssub * CrimsonPro-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{CrimsonPro-Inf}{bx}{it}{
       <-> ssub * CrimsonPro-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-LF.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-LF.fd
index fcd139435ed..cfdadac19c5 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-LF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-LF.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-LF.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-LF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-LF}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{regular}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-titling-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{sl}{
-      <-> ssub * CrimsonPro-LF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/eb/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{bold}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-t1
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{light}{sl}{
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-titling-t1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{sl}{
-      <-> ssub * CrimsonPro-LF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/sb/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{black}{sl}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-LF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-LF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{medium}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-swash-t1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{sl}{
-      <-> ssub * CrimsonPro-LF/mb/it
+\DeclareFontShape{T1}{CrimsonPro-LF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-LF/mb/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-t1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-t1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{el}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{el}{n}{
+      <-> ssub * CrimsonPro-LF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{el}{it}{
+      <-> ssub * CrimsonPro-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{sl}{
-      <-> ssub * CrimsonPro-LF/m/it
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-LF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{l}{sl}{
+      <-> ssub * CrimsonPro-LF/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-LF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-t1
+      <-> ssub * CrimsonPro-LF/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-LF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-t1
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-titling-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-swash-t1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{sl}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{sl}{
-      <-> ssub * CrimsonPro-LF/l/it
+\DeclareFontShape{T1}{CrimsonPro-LF}{sl}{n}{
+      <-> ssub * CrimsonPro-LF/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-LF/l/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{sl}{it}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-titling-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-t1
-}{}
+%   m --> medium
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{m}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{m}{n}{
+      <-> ssub * CrimsonPro-LF/medium/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{m}{it}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{sl}{
-      <-> ssub * CrimsonPro-LF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-LF/k/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{n}{
+      <-> ssub * CrimsonPro-LF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{sb}{it}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-titling-t1
-}{}
+%   b --> bold
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{b}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{b}{n}{
+      <-> ssub * CrimsonPro-LF/bold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{sl}{
-      <-> ssub * CrimsonPro-LF/b/it
+\DeclareFontShape{T1}{CrimsonPro-LF}{b}{it}{
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-titling-t1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{n}{
+      <-> ssub * CrimsonPro-LF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-LF}{eb}{it}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-swash-t1
-}{}
+%   ub --> black
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{sl}{
-      <-> ssub * CrimsonPro-LF/el/it
+\DeclareFontShape{T1}{CrimsonPro-LF}{ub}{sl}{
+      <-> ssub * CrimsonPro-LF/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-LF/el/tlit
+\DeclareFontShape{T1}{CrimsonPro-LF}{ub}{n}{
+      <-> ssub * CrimsonPro-LF/black/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{tl}{
-      <-> ssub * CrimsonPro-LF/b/tl
+\DeclareFontShape{T1}{CrimsonPro-LF}{ub}{it}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-LF}{bx}{n}{
       <-> ssub * CrimsonPro-LF/b/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{it}{
-      <-> ssub * CrimsonPro-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{sw}{
-      <-> ssub * CrimsonPro-LF/b/sw
-}{}
-
 \DeclareFontShape{T1}{CrimsonPro-LF}{bx}{sl}{
       <-> ssub * CrimsonPro-LF/b/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-LF/b/tlit
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-LF/b/tlsl
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{nw}{
-      <-> ssub * CrimsonPro-LF/b/nw
+\DeclareFontShape{T1}{CrimsonPro-LF}{bx}{it}{
+      <-> ssub * CrimsonPro-LF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-OsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-OsF.fd
index 3ba93c2c54e..0a9c91985f0 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-OsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-OsF.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-OsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,184 +11,259 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-OsF}{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-t1
-}{}
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-OsF/eb/it
+\DeclareFontShape{T1}{CrimsonPro-OsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-OsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-OsF/sb/it
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{light}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{mb}{n}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{black}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-OsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-swash-t1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-OsF/mb/it
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-t1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{n}{
+      <-> ssub * CrimsonPro-OsF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{it}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{sl}{
-      <-> ssub * CrimsonPro-OsF/m/it
+
+%   l --> light
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{l}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-OsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-t1
+      <-> ssub * CrimsonPro-OsF/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-OsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-t1
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-swash-t1
+%   sl --> regular
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{l}{sl}{
-      <-> ssub * CrimsonPro-OsF/l/it
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sl}{n}{
+      <-> ssub * CrimsonPro-OsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sl}{it}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-t1
+
+%   m --> medium
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{n}{
+      <-> ssub * CrimsonPro-OsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{m}{it}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{k}{sl}{
-      <-> ssub * CrimsonPro-OsF/k/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{n}{
+      <-> ssub * CrimsonPro-OsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{sb}{it}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-swash-t1
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{n}{
+      <-> ssub * CrimsonPro-OsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/it
+\DeclareFontShape{T1}{CrimsonPro-OsF}{b}{it}{
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-t1
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{n}{
+      <-> ssub * CrimsonPro-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-OsF}{eb}{it}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-swash-t1
+
+%   ub --> black
+
+\DeclareFontShape{T1}{CrimsonPro-OsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{el}{sl}{
-      <-> ssub * CrimsonPro-OsF/el/it
+\DeclareFontShape{T1}{CrimsonPro-OsF}{ub}{n}{
+      <-> ssub * CrimsonPro-OsF/black/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/sl
+\DeclareFontShape{T1}{CrimsonPro-OsF}{ub}{it}{
+      <-> ssub * CrimsonPro-OsF/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{n}{
       <-> ssub * CrimsonPro-OsF/b/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{it}{
-      <-> ssub * CrimsonPro-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{sw}{
-      <-> ssub * CrimsonPro-OsF/b/sw
+\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-OsF/b/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{nw}{
-      <-> ssub * CrimsonPro-OsF/b/nw
+\DeclareFontShape{T1}{CrimsonPro-OsF}{bx}{it}{
+      <-> ssub * CrimsonPro-OsF/b/it
 }{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Sup.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Sup.fd
index 499de65ef25..1c7661c039a 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Sup.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-Sup.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-Sup.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-Sup.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-Sup}{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{sl}{
-      <-> ssub * CrimsonPro-Sup/eb/it
+\DeclareFontShape{T1}{CrimsonPro-Sup}{regular}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-Sup}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{sl}{
-      <-> ssub * CrimsonPro-Sup/sb/it
+\DeclareFontShape{T1}{CrimsonPro-Sup}{semibold}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{bold}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{light}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{black}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-Sup}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{mb}{sl}{
-      <-> ssub * CrimsonPro-Sup/mb/it
+\DeclareFontShape{T1}{CrimsonPro-Sup}{medium}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-sup-t1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{sl}{
-      <-> ssub * CrimsonPro-Sup/m/it
+\DeclareFontShape{T1}{CrimsonPro-Sup}{extralight}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{sl}{
+      <-> ssub * CrimsonPro-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{n}{
+      <-> ssub * CrimsonPro-Sup/extralight/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{it}{
+      <-> ssub * CrimsonPro-Sup/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{l}{sl}{
+      <-> ssub * CrimsonPro-Sup/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Sup}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-sup-t1
+      <-> ssub * CrimsonPro-Sup/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Sup}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-sup-t1
+      <-> ssub * CrimsonPro-Sup/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{l}{sl}{
-      <-> ssub * CrimsonPro-Sup/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sl}{sl}{
+      <-> ssub * CrimsonPro-Sup/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sl}{n}{
+      <-> ssub * CrimsonPro-Sup/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sl}{it}{
+      <-> ssub * CrimsonPro-Sup/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{sl}{
+      <-> ssub * CrimsonPro-Sup/medium/sl
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{n}{
+      <-> ssub * CrimsonPro-Sup/medium/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{m}{it}{
+      <-> ssub * CrimsonPro-Sup/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{sl}{
+      <-> ssub * CrimsonPro-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{k}{sl}{
-      <-> ssub * CrimsonPro-Sup/k/it
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{n}{
+      <-> ssub * CrimsonPro-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{sb}{it}{
+      <-> ssub * CrimsonPro-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{b}{sl}{
+      <-> ssub * CrimsonPro-Sup/bold/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Sup}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-sup-t1
+      <-> ssub * CrimsonPro-Sup/bold/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Sup}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-sup-t1
+      <-> ssub * CrimsonPro-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{b}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{sl}{
+      <-> ssub * CrimsonPro-Sup/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{n}{
+      <-> ssub * CrimsonPro-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-sup-t1
+\DeclareFontShape{T1}{CrimsonPro-Sup}{eb}{it}{
+      <-> ssub * CrimsonPro-Sup/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{el}{sl}{
-      <-> ssub * CrimsonPro-Sup/el/it
+
+%   ub --> black
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{ub}{sl}{
+      <-> ssub * CrimsonPro-Sup/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-Sup}{bx}{sl}{
-      <-> ssub * CrimsonPro-Sup/b/sl
+\DeclareFontShape{T1}{CrimsonPro-Sup}{ub}{n}{
+      <-> ssub * CrimsonPro-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-Sup}{ub}{it}{
+      <-> ssub * CrimsonPro-Sup/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-Sup}{bx}{n}{
       <-> ssub * CrimsonPro-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{CrimsonPro-Sup}{bx}{sl}{
+      <-> ssub * CrimsonPro-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{CrimsonPro-Sup}{bx}{it}{
       <-> ssub * CrimsonPro-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TLF.fd b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TLF.fd
index 03c31179176..b9f6fecd2ea 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/T1CrimsonPro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{T1CrimsonPro-TLF.fd}
-    [2018/12/17 (autoinst)  Font definitions for T1/CrimsonPro-TLF.]
+    [2019/10/15 (autoinst)  Font definitions for T1/CrimsonPro-TLF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,292 +11,259 @@
 
 \DeclareFontFamily{T1}{CrimsonPro-TLF}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-titling-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{semibold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{semibold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TLF/eb/it
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/eb/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-t1
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{light}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-titling-t1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TLF/sb/it
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/sb/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{black}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CrimsonPro-TLF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{it}{
+\DeclareFontShape{T1}{CrimsonPro-TLF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-swash-t1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TLF/mb/it
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{mb}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/mb/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-t1
-}{}
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-t1
-}{}
+%   el --> extralight
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{n}{
+      <-> ssub * CrimsonPro-TLF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{it}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{sl}{
-      <-> ssub * CrimsonPro-TLF/m/it
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/m/tlit
-}{}
+%   l --> light
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/sl
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TLF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-t1
+      <-> ssub * CrimsonPro-TLF/light/n
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TLF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-t1
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-titling-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-swash-t1
-}{}
+%   sl --> regular
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{sl}{
-      <-> ssub * CrimsonPro-TLF/l/it
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sl}{n}{
+      <-> ssub * CrimsonPro-TLF/regular/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{l}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/l/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sl}{it}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-titling-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-t1
-}{}
+%   m --> medium
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{n}{
+      <-> ssub * CrimsonPro-TLF/medium/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{m}{it}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{sl}{
-      <-> ssub * CrimsonPro-TLF/k/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{k}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/k/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{n}{
+      <-> ssub * CrimsonPro-TLF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{sb}{it}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-titling-t1
-}{}
+%   b --> bold
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-swash-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{n}{
+      <-> ssub * CrimsonPro-TLF/bold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{sl}{
-      <-> ssub * CrimsonPro-TLF/b/it
+\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{it}{
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{b}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{tl}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-titling-t1
-}{}
+%   eb --> extrabold
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{n}{
+      <-> ssub * CrimsonPro-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{tlit}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-titling-t1
+\DeclareFontShape{T1}{CrimsonPro-TLF}{eb}{it}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{sw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-swash-t1
-}{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{nw}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-swash-t1
-}{}
+%   ub --> black
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{sl}{
-      <-> ssub * CrimsonPro-TLF/el/it
+\DeclareFontShape{T1}{CrimsonPro-TLF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{el}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/el/tlit
+\DeclareFontShape{T1}{CrimsonPro-TLF}{ub}{n}{
+      <-> ssub * CrimsonPro-TLF/black/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{tl}{
-      <-> ssub * CrimsonPro-TLF/b/tl
+\DeclareFontShape{T1}{CrimsonPro-TLF}{ub}{it}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
 \DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{n}{
       <-> ssub * CrimsonPro-TLF/b/n
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{it}{
-      <-> ssub * CrimsonPro-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{sw}{
-      <-> ssub * CrimsonPro-TLF/b/sw
-}{}
-
 \DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{sl}{
       <-> ssub * CrimsonPro-TLF/b/sl
 }{}
 
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{tlit}{
-      <-> ssub * CrimsonPro-TLF/b/tlit
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{tlsl}{
-      <-> ssub * CrimsonPro-TLF/b/tlsl
-}{}
-
-\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{nw}{
-      <-> ssub * CrimsonPro-TLF/b/nw
+\DeclareFontShape{T1}{CrimsonPro-TLF}{bx}{it}{
+      <-> ssub * CrimsonPro-TLF/b/it
 }{}
 
 \endinput
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
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-LF.fd b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-LF.fd
index 109f30559b2..1575519a2c7 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-LF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{TS1CrimsonPro-LF.fd}
-    [2018/12/17 (autoinst)  Font definitions for TS1/CrimsonPro-LF.]
+    [2019/10/15 (autoinst)  Font definitions for TS1/CrimsonPro-LF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{TS1}{CrimsonPro-LF}{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{sl}{
-      <-> ssub * CrimsonPro-LF/eb/it
+\DeclareFontShape{TS1}{CrimsonPro-LF}{regular}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-LF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{sl}{
-      <-> ssub * CrimsonPro-LF/sb/it
+\DeclareFontShape{TS1}{CrimsonPro-LF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{bold}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{light}{sl}{
+      <-> ssub * CrimsonPro-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{black}{sl}{
+      <-> ssub * CrimsonPro-LF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{mb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-LF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{mb}{sl}{
-      <-> ssub * CrimsonPro-LF/mb/it
+\DeclareFontShape{TS1}{CrimsonPro-LF}{medium}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-lf-ts1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{sl}{
-      <-> ssub * CrimsonPro-LF/m/it
+\DeclareFontShape{TS1}{CrimsonPro-LF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{sl}{
+      <-> ssub * CrimsonPro-LF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{n}{
+      <-> ssub * CrimsonPro-LF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{it}{
+      <-> ssub * CrimsonPro-LF/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{l}{sl}{
+      <-> ssub * CrimsonPro-LF/light/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-LF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-lf-ts1
+      <-> ssub * CrimsonPro-LF/light/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-LF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-lf-ts1
+      <-> ssub * CrimsonPro-LF/light/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{l}{sl}{
-      <-> ssub * CrimsonPro-LF/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sl}{sl}{
+      <-> ssub * CrimsonPro-LF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sl}{n}{
+      <-> ssub * CrimsonPro-LF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sl}{it}{
+      <-> ssub * CrimsonPro-LF/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{sl}{
+      <-> ssub * CrimsonPro-LF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{n}{
+      <-> ssub * CrimsonPro-LF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{m}{it}{
+      <-> ssub * CrimsonPro-LF/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{sl}{
+      <-> ssub * CrimsonPro-LF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{k}{sl}{
-      <-> ssub * CrimsonPro-LF/k/it
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{n}{
+      <-> ssub * CrimsonPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{sb}{it}{
+      <-> ssub * CrimsonPro-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{b}{sl}{
+      <-> ssub * CrimsonPro-LF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-LF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-lf-ts1
+      <-> ssub * CrimsonPro-LF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-LF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-lf-ts1
+      <-> ssub * CrimsonPro-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{b}{sl}{
-      <-> ssub * CrimsonPro-LF/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{sl}{
+      <-> ssub * CrimsonPro-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{n}{
+      <-> ssub * CrimsonPro-LF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-lf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-LF}{eb}{it}{
+      <-> ssub * CrimsonPro-LF/extrabold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{el}{sl}{
-      <-> ssub * CrimsonPro-LF/el/it
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{ub}{sl}{
+      <-> ssub * CrimsonPro-LF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-LF}{bx}{sl}{
-      <-> ssub * CrimsonPro-LF/b/sl
+\DeclareFontShape{TS1}{CrimsonPro-LF}{ub}{n}{
+      <-> ssub * CrimsonPro-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-LF}{ub}{it}{
+      <-> ssub * CrimsonPro-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-LF}{bx}{n}{
       <-> ssub * CrimsonPro-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CrimsonPro-LF}{bx}{sl}{
+      <-> ssub * CrimsonPro-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CrimsonPro-LF}{bx}{it}{
       <-> ssub * CrimsonPro-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-OsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-OsF.fd
index 185342d4ccc..9fac191e564 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-OsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{TS1CrimsonPro-OsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for TS1/CrimsonPro-OsF.]
+    [2019/10/15 (autoinst)  Font definitions for TS1/CrimsonPro-OsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{TS1}{CrimsonPro-OsF}{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-OsF/eb/it
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-OsF/sb/it
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{light}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{black}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-OsF/mb/it
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-osf-ts1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{sl}{
-      <-> ssub * CrimsonPro-OsF/m/it
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{sl}{
+      <-> ssub * CrimsonPro-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{n}{
+      <-> ssub * CrimsonPro-OsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{it}{
+      <-> ssub * CrimsonPro-OsF/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{l}{sl}{
+      <-> ssub * CrimsonPro-OsF/light/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-osf-ts1
+      <-> ssub * CrimsonPro-OsF/light/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-osf-ts1
+      <-> ssub * CrimsonPro-OsF/light/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{l}{sl}{
-      <-> ssub * CrimsonPro-OsF/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sl}{n}{
+      <-> ssub * CrimsonPro-OsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sl}{it}{
+      <-> ssub * CrimsonPro-OsF/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{sl}{
+      <-> ssub * CrimsonPro-OsF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{n}{
+      <-> ssub * CrimsonPro-OsF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{m}{it}{
+      <-> ssub * CrimsonPro-OsF/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{k}{sl}{
-      <-> ssub * CrimsonPro-OsF/k/it
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{n}{
+      <-> ssub * CrimsonPro-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{sb}{it}{
+      <-> ssub * CrimsonPro-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{b}{sl}{
+      <-> ssub * CrimsonPro-OsF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-osf-ts1
+      <-> ssub * CrimsonPro-OsF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-osf-ts1
+      <-> ssub * CrimsonPro-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{b}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{n}{
+      <-> ssub * CrimsonPro-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-osf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{eb}{it}{
+      <-> ssub * CrimsonPro-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{el}{sl}{
-      <-> ssub * CrimsonPro-OsF/el/it
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-OsF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-OsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-OsF/b/sl
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{ub}{n}{
+      <-> ssub * CrimsonPro-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{ub}{it}{
+      <-> ssub * CrimsonPro-OsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{bx}{n}{
       <-> ssub * CrimsonPro-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CrimsonPro-OsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CrimsonPro-OsF}{bx}{it}{
       <-> ssub * CrimsonPro-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TLF.fd b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TLF.fd
index 1ef51103123..9a7c52ddcb6 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TLF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{TS1CrimsonPro-TLF.fd}
-    [2018/12/17 (autoinst)  Font definitions for TS1/CrimsonPro-TLF.]
+    [2019/10/15 (autoinst)  Font definitions for TS1/CrimsonPro-TLF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{TS1}{CrimsonPro-TLF}{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TLF/eb/it
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TLF/sb/it
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{light}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{black}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TLF/mb/it
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tlf-ts1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{sl}{
-      <-> ssub * CrimsonPro-TLF/m/it
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{sl}{
+      <-> ssub * CrimsonPro-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{n}{
+      <-> ssub * CrimsonPro-TLF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{it}{
+      <-> ssub * CrimsonPro-TLF/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{l}{sl}{
+      <-> ssub * CrimsonPro-TLF/light/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tlf-ts1
+      <-> ssub * CrimsonPro-TLF/light/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tlf-ts1
+      <-> ssub * CrimsonPro-TLF/light/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{l}{sl}{
-      <-> ssub * CrimsonPro-TLF/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TLF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sl}{n}{
+      <-> ssub * CrimsonPro-TLF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sl}{it}{
+      <-> ssub * CrimsonPro-TLF/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{sl}{
+      <-> ssub * CrimsonPro-TLF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{n}{
+      <-> ssub * CrimsonPro-TLF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{m}{it}{
+      <-> ssub * CrimsonPro-TLF/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{k}{sl}{
-      <-> ssub * CrimsonPro-TLF/k/it
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{n}{
+      <-> ssub * CrimsonPro-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{sb}{it}{
+      <-> ssub * CrimsonPro-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{b}{sl}{
+      <-> ssub * CrimsonPro-TLF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tlf-ts1
+      <-> ssub * CrimsonPro-TLF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tlf-ts1
+      <-> ssub * CrimsonPro-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{b}{sl}{
-      <-> ssub * CrimsonPro-TLF/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{n}{
+      <-> ssub * CrimsonPro-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{eb}{it}{
+      <-> ssub * CrimsonPro-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{el}{sl}{
-      <-> ssub * CrimsonPro-TLF/el/it
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TLF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TLF}{bx}{sl}{
-      <-> ssub * CrimsonPro-TLF/b/sl
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{ub}{n}{
+      <-> ssub * CrimsonPro-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{ub}{it}{
+      <-> ssub * CrimsonPro-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{bx}{n}{
       <-> ssub * CrimsonPro-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CrimsonPro-TLF}{bx}{sl}{
+      <-> ssub * CrimsonPro-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CrimsonPro-TLF}{bx}{it}{
       <-> ssub * CrimsonPro-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TOsF.fd b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TOsF.fd
index 74b1b700ecc..139ab61a447 100644
--- a/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/crimsonpro/TS1CrimsonPro-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/12/17
+%% Generated by autoinst on 2019/10/15
 %%
 \ProvidesFile{TS1CrimsonPro-TOsF.fd}
-    [2018/12/17 (autoinst)  Font definitions for TS1/CrimsonPro-TOsF.]
+    [2019/10/15 (autoinst)  Font definitions for TS1/CrimsonPro-TOsF.]
 
 \expandafter\ifx\csname CrimsonPro@scale\endcsname\relax
     \let\CrimsonPro@@scale\@empty
@@ -11,110 +11,257 @@
 
 \DeclareFontFamily{TS1}{CrimsonPro-TOsF}{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{regular}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{regular}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/eb/it
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{regular}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{semibold}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{semibold}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/sb/it
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{semibold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{mb}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{bold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{bold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{bold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{light}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{light}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{light}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extrabold}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extrabold}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extrabold}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{black}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{black}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{black}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{medium}{n}{
       <-> \CrimsonPro@@scale CrimsonPro-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{medium}{it}{
       <-> \CrimsonPro@@scale CrimsonPro-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{mb}{sl}{
-      <-> ssub * CrimsonPro-TOsF/mb/it
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{medium}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Regular-tosf-ts1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extralight}{n}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-Italic-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extralight}{it}{
+      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{sl}{
-      <-> ssub * CrimsonPro-TOsF/m/it
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{extralight}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{n}{
+      <-> ssub * CrimsonPro-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{it}{
+      <-> ssub * CrimsonPro-TOsF/extralight/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{l}{sl}{
+      <-> ssub * CrimsonPro-TOsF/light/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{l}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Light-tosf-ts1
+      <-> ssub * CrimsonPro-TOsF/light/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{l}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-LightItalic-tosf-ts1
+      <-> ssub * CrimsonPro-TOsF/light/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{l}{sl}{
-      <-> ssub * CrimsonPro-TOsF/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sl}{sl}{
+      <-> ssub * CrimsonPro-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{k}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Black-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sl}{n}{
+      <-> ssub * CrimsonPro-TOsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{k}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BlackItalic-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sl}{it}{
+      <-> ssub * CrimsonPro-TOsF/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{sl}{
+      <-> ssub * CrimsonPro-TOsF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{n}{
+      <-> ssub * CrimsonPro-TOsF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{m}{it}{
+      <-> ssub * CrimsonPro-TOsF/medium/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{k}{sl}{
-      <-> ssub * CrimsonPro-TOsF/k/it
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{n}{
+      <-> ssub * CrimsonPro-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{sb}{it}{
+      <-> ssub * CrimsonPro-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{b}{sl}{
+      <-> ssub * CrimsonPro-TOsF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{b}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-Bold-tosf-ts1
+      <-> ssub * CrimsonPro-TOsF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{b}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-BoldItalic-tosf-ts1
+      <-> ssub * CrimsonPro-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{b}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{sl}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{n}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLight-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{n}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{it}{
-      <-> \CrimsonPro@@scale CrimsonPro-ExtraLightItalic-tosf-ts1
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{eb}{it}{
+      <-> ssub * CrimsonPro-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{el}{sl}{
-      <-> ssub * CrimsonPro-TOsF/el/it
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{ub}{sl}{
+      <-> ssub * CrimsonPro-TOsF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{CrimsonPro-TOsF}{bx}{sl}{
-      <-> ssub * CrimsonPro-TOsF/b/sl
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{ub}{n}{
+      <-> ssub * CrimsonPro-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{ub}{it}{
+      <-> ssub * CrimsonPro-TOsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{bx}{n}{
       <-> ssub * CrimsonPro-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CrimsonPro-TOsF}{bx}{sl}{
+      <-> ssub * CrimsonPro-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CrimsonPro-TOsF}{bx}{it}{
       <-> ssub * CrimsonPro-TOsF/b/it
 }{}