cormorantgaramond (24jun19)

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

41 files changed, 6144 insertions, 803 deletions

diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
index 8465db3f84d..aeab02828f0 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/CormorantGaramond.sty
@@ -1,16 +1,16 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{CormorantGaramond}
-    [2016/08/15 (Bob Tennent and autoinst)  Style file for Cormorant Garamond fonts.]
+    [2019/06/24 (Bob Tennent and autoinst)  Style file for Cormorant Garamond fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-\newif\ifcormorantgaramond@otf 
+\newif\ifcormorantgaramond@ttf 
 \ifxetex
-  \cormorantgaramond@otftrue
+  \cormorantgaramond@ttftrue
 \else\ifluatex
-  \cormorantgaramond@otftrue
+  \cormorantgaramond@ttftrue
 \else  % [pdf]LaTeX
-  \cormorantgaramond@otffalse
+  \cormorantgaramond@ttffalse
 \fi\fi
 
 \newif\ifcormorantgaramond@lining \cormorantgaramond@liningtrue
@@ -23,7 +23,7 @@
 \RequirePackage{xkeyval}
 \DeclareOptionX{scaled}{\renewcommand*{\CormorantGaramond@scale}{#1}}
 \DeclareOptionX{scale}{\renewcommand*{\CormorantGaramond@scale}{#1}}
-\DeclareOptionX{type1}{\cormorantgaramond@otffalse}
+\DeclareOptionX{type1}{\cormorantgaramond@ttffalse}
 \DeclareOptionX{lining}{\cormorantgaramond@liningtrue}
 \DeclareOptionX{nf}{\cormorantgaramond@liningtrue}
 \DeclareOptionX{lf}{\cormorantgaramond@liningtrue}
@@ -41,7 +41,7 @@
 
 \ProcessOptionsX\relax
 
-\ifcormorantgaramond@otf
+\ifcormorantgaramond@ttf
   \ifcormorantgaramond@lining
     \def\cormorantgaramond@figurestyle{Lining}
   \else
@@ -65,36 +65,37 @@
   \fi
 \fi
 
-\ifcormorantgaramond@otf
+\ifcormorantgaramond@ttf
   \def\cormorantgaramond@boldstyle{Bold}
   \ifcormorantgaramond@semibold\def\cormorantgaramond@boldstyle{SemiBold}\fi
   \ifcormorantgaramond@medium\def\cormorantgaramond@boldstyle{Medium}\fi
   \def\cormorantgaramond@regstyle{Regular}
   \ifcormorantgaramond@light\def\cormorantgaramond@regstyle{Light}\fi
 \else
-  \def\bfseries@rm{b}
-  \ifcormorantgaramond@semibold\def\bfseries@rm{sb}\fi
-  \ifcormorantgaramond@medium\def\bfseries@rm{mb}\fi
-  \def\mdseries@rm{m}
-  \ifcormorantgaramond@light\def\mdseries@rm{l}\fi
+  \def\bfseries@rm{bold}
+  \ifcormorantgaramond@semibold\def\bfseries@rm{semibold}\fi
+  \ifcormorantgaramond@medium\def\bfseries@rm{medium}\fi
+  \def\mdseries@rm{regular}
+  \ifcormorantgaramond@light\def\mdseries@rm{light}\fi
 \fi
 
-\ifcormorantgaramond@otf
+\ifcormorantgaramond@ttf
   \RequirePackage{fontspec}
 \else
   \RequirePackage{fontenc,fontaxes,mweights}
 \fi
 
-\ifcormorantgaramond@otf
+\ifcormorantgaramond@ttf
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \CormorantGaramond@scale ,
-        Extension = .otf }
+        Extension = .ttf }
+  \def\cormorantgaramond@regular{Regular}
   \setmainfont
       [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
       ]
@@ -102,7 +103,7 @@
   \newfontfamily\cormorantgaramond
       [ Numbers = {\cormorantgaramond@figurealign,\cormorantgaramond@figurestyle},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
       ]
@@ -112,7 +113,7 @@
   \newfontfamily\cormorantgaramondOsF
       [ Numbers = {\cormorantgaramond@figurealign,OldStyle},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
       ]
@@ -120,7 +121,7 @@
   \newfontfamily\cormorantgaramondLF
       [ Numbers = {\cormorantgaramond@figurealign,Lining},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
       ]
@@ -128,7 +129,7 @@
   \newfontfamily\cormorantgaramondtabular
     [ Numbers = {Monospaced,\cormorantgaramond@figurestyle},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
     ]
@@ -136,7 +137,7 @@
   \newfontfamily\cormorantgaramondproportional
     [ Numbers = {\cormorantgaramond@figurestyle},
         UprightFont    = *-\cormorantgaramond@regstyle ,
-        ItalicFont     = *-\cormorantgaramond@regstyle Italic ,
+        ItalicFont     = *-\ifx\cormorantgaramond@regstyle\cormorantgaramond@regular Italic\else\cormorantgaramond@regstyle Italic\fi ,
         BoldFont    = *-\cormorantgaramond@boldstyle ,
         BoldItalicFont     = *-\cormorantgaramond@boldstyle Italic ,
     ]
@@ -171,7 +172,7 @@
 \DeclareTextFontCommand{\textsu}{\sufigures}
 \DeclareTextFontCommand{\textinf}{\infigures}
 
-\ifcormorantgaramond@otf
+\ifcormorantgaramond@ttf
   \defaultfontfeatures{}
 \fi
 
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Inf.fd
index f67439f39ea..345a65fd28a 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-Inf.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-Inf.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-Inf.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-Inf}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{sl}{
-      <-> ssub * CormorantGaramond-Inf/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Inf}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-ly1
+      <-> ssub * CormorantGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Inf}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-ly1
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{m}{sl}{
-      <-> ssub * CormorantGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Inf}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Inf}{bx}{n}{
       <-> ssub * CormorantGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-Inf}{bx}{it}{
       <-> ssub * CormorantGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-LF.fd
index 2d14b21eb15..562c70e94d0 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-LF.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-LF.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-LF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-LF}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{sl}{
-      <-> ssub * CormorantGaramond-LF/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-LF/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{mb}{n}{
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-LF/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-LF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-ly1
+      <-> ssub * CormorantGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-LF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ly1
+      <-> ssub * CormorantGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-LF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ly1
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{m}{sl}{
-      <-> ssub * CormorantGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-LF/b/sc
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{n}{
       <-> ssub * CormorantGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-LF}{bx}{it}{
       <-> ssub * CormorantGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-OsF.fd
index 433028bfa1e..3ddb5050bc8 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-OsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-OsF.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-OsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-OsF}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-OsF/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{mb}{n}{
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-OsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-ly1
+      <-> ssub * CormorantGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-OsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ly1
+      <-> ssub * CormorantGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-OsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ly1
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-OsF/b/sc
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{n}{
       <-> ssub * CormorantGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-OsF}{bx}{it}{
       <-> ssub * CormorantGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Sup.fd
index 171d61df9bf..165997befb1 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-Sup.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-Sup.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-Sup.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-Sup}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{sl}{
-      <-> ssub * CormorantGaramond-Sup/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Sup}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-ly1
+      <-> ssub * CormorantGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Sup}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-ly1
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{m}{sl}{
-      <-> ssub * CormorantGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-Sup}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-Sup}{bx}{n}{
       <-> ssub * CormorantGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-Sup}{bx}{it}{
       <-> ssub * CormorantGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TLF.fd
index b0cd9d6b35b..3a410063964 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-TLF.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-TLF.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-TLF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-TLF}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TLF/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{mb}{n}{
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TLF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-ly1
+      <-> ssub * CormorantGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TLF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ly1
+      <-> ssub * CormorantGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TLF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ly1
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TLF/b/sc
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{n}{
       <-> ssub * CormorantGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-TLF}{bx}{it}{
       <-> ssub * CormorantGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TOsF.fd
index 4ae4ca8da25..01aff3a6d91 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/LY1CormorantGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{LY1CormorantGaramond-TOsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for LY1/CormorantGaramond-TOsF.]
+    [2019/06/24 (autoinst)  Font definitions for LY1/CormorantGaramond-TOsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{LY1}{CormorantGaramond-TOsF}{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/l/it
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/it
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/sb/it
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/mb/it
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TOsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-ly1
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TOsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ly1
+      <-> ssub * CormorantGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TOsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ly1
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/sl
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TOsF/b/sc
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{n}{
       <-> ssub * CormorantGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{CormorantGaramond-TOsF}{bx}{it}{
       <-> ssub * CormorantGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Inf.fd
index d989c1da1b1..71b6f52dccf 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-Inf.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-Inf.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-Inf.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-Inf}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{sl}{
-      <-> ssub * CormorantGaramond-Inf/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Inf}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-ot1
+      <-> ssub * CormorantGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Inf}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-ot1
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{m}{sl}{
-      <-> ssub * CormorantGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Inf}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Inf}{bx}{n}{
       <-> ssub * CormorantGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-Inf}{bx}{it}{
       <-> ssub * CormorantGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-LF.fd
index 0c3b3094e3c..26d2d330f70 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-LF.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-LF.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-LF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-LF}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{sl}{
-      <-> ssub * CormorantGaramond-LF/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-LF/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{mb}{n}{
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-LF/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-LF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-ot1
+      <-> ssub * CormorantGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-LF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ot1
+      <-> ssub * CormorantGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-LF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ot1
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{m}{sl}{
-      <-> ssub * CormorantGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-LF/b/sc
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{n}{
       <-> ssub * CormorantGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-LF}{bx}{it}{
       <-> ssub * CormorantGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-OsF.fd
index 23d2b82407d..305ea8ca2fe 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-OsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-OsF.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-OsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-OsF}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-OsF/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{mb}{n}{
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-OsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-ot1
+      <-> ssub * CormorantGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-OsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ot1
+      <-> ssub * CormorantGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-OsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ot1
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-OsF/b/sc
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{n}{
       <-> ssub * CormorantGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-OsF}{bx}{it}{
       <-> ssub * CormorantGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Sup.fd
index 06d7155c0d4..7ab8b83d594 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-Sup.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-Sup.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-Sup.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-Sup}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{sl}{
-      <-> ssub * CormorantGaramond-Sup/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Sup}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-ot1
+      <-> ssub * CormorantGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Sup}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-ot1
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{m}{sl}{
-      <-> ssub * CormorantGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-Sup}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-Sup}{bx}{n}{
       <-> ssub * CormorantGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-Sup}{bx}{it}{
       <-> ssub * CormorantGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TLF.fd
index f4fd4b28e9e..ccc2265c875 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-TLF.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-TLF.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-TLF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-TLF}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TLF/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{mb}{n}{
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TLF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-ot1
+      <-> ssub * CormorantGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TLF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ot1
+      <-> ssub * CormorantGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TLF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ot1
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TLF/b/sc
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{n}{
       <-> ssub * CormorantGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-TLF}{bx}{it}{
       <-> ssub * CormorantGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TOsF.fd
index 1d18fc86b6a..3fe9296d246 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/OT1CormorantGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{OT1CormorantGaramond-TOsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for OT1/CormorantGaramond-TOsF.]
+    [2019/06/24 (autoinst)  Font definitions for OT1/CormorantGaramond-TOsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{OT1}{CormorantGaramond-TOsF}{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/l/it
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/it
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/sb/it
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/mb/it
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TOsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-ot1
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TOsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ot1
+      <-> ssub * CormorantGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TOsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ot1
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/sl
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TOsF/b/sc
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{n}{
       <-> ssub * CormorantGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{CormorantGaramond-TOsF}{bx}{it}{
       <-> ssub * CormorantGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Inf.fd
index b330c655e48..a8379083b40 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-Inf.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-Inf.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-Inf.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-Inf}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-t1
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{sl}{
-      <-> ssub * CormorantGaramond-Inf/l/it
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-t1
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/it
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-t1
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Inf/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Inf}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-t1
+      <-> ssub * CormorantGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Inf}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-t1
+      <-> ssub * CormorantGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{m}{sl}{
-      <-> ssub * CormorantGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Inf}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Inf/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Inf}{bx}{n}{
       <-> ssub * CormorantGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-Inf}{bx}{it}{
       <-> ssub * CormorantGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-LF.fd
index 7cec8a630ff..df03428eecd 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-LF.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-LF.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-LF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-LF}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{sl}{
-      <-> ssub * CormorantGaramond-LF/l/it
+\DeclareFontShape{T1}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/it
+\DeclareFontShape{T1}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-LF/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{mb}{n}{
+\DeclareFontShape{T1}{CormorantGaramond-LF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-LF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-LF/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-LF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-t1
+      <-> ssub * CormorantGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-LF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-t1
+      <-> ssub * CormorantGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-LF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-t1
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{m}{sl}{
-      <-> ssub * CormorantGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-LF/b/sc
+\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{n}{
       <-> ssub * CormorantGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-LF}{bx}{it}{
       <-> ssub * CormorantGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-OsF.fd
index fcb06d16814..b4c17829cc0 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-OsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-OsF.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-OsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-OsF}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-OsF/l/it
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/it
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{mb}{n}{
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-OsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-t1
+      <-> ssub * CormorantGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-OsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-t1
+      <-> ssub * CormorantGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-OsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-t1
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-OsF/b/sc
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{n}{
       <-> ssub * CormorantGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-OsF}{bx}{it}{
       <-> ssub * CormorantGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Sup.fd
index a186b5eb952..74780ba52b1 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-Sup.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-Sup.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-Sup.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-Sup}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-t1
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{sl}{
-      <-> ssub * CormorantGaramond-Sup/l/it
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-t1
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/it
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-t1
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{mb}{sl}{
-      <-> ssub * CormorantGaramond-Sup/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Sup}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-t1
+      <-> ssub * CormorantGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Sup}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-t1
+      <-> ssub * CormorantGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{m}{sl}{
-      <-> ssub * CormorantGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-Sup}{bx}{sl}{
-      <-> ssub * CormorantGaramond-Sup/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-Sup}{bx}{n}{
       <-> ssub * CormorantGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-Sup}{bx}{it}{
       <-> ssub * CormorantGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TLF.fd
index 02059cad831..781a9cf3cf4 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-TLF.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-TLF.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-TLF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-TLF}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TLF/l/it
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/it
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{mb}{n}{
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TLF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-t1
+      <-> ssub * CormorantGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TLF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-t1
+      <-> ssub * CormorantGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TLF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-t1
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TLF/b/sc
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{n}{
       <-> ssub * CormorantGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-TLF}{bx}{it}{
       <-> ssub * CormorantGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TOsF.fd
index 3ce5b6cbadd..ee8dd10e2cf 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T1CormorantGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{T1CormorantGaramond-TOsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for T1/CormorantGaramond-TOsF.]
+    [2019/06/24 (autoinst)  Font definitions for T1/CormorantGaramond-TOsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,98 +11,192 @@
 
 \DeclareFontFamily{T1}{CormorantGaramond-TOsF}{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/l/it
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/it
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/sb/it
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{medium}{sc}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/mb/it
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TOsF}{m}{sc}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-t1
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TOsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-t1
+      <-> ssub * CormorantGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TOsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-t1
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/sl
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{sc}{
-      <-> ssub * CormorantGaramond-TOsF/b/sc
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
 \DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{n}{
       <-> ssub * CormorantGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{CormorantGaramond-TOsF}{bx}{it}{
       <-> ssub * CormorantGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Inf.fd
new file mode 100644
index 00000000000..154afdac93a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Inf.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-Inf.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-Inf.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-Inf}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{m}{n}{
+      <-> ssub * CormorantGaramond-Inf/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{m}{it}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bx}{n}{
+      <-> ssub * CormorantGaramond-Inf/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Inf}{bx}{it}{
+      <-> ssub * CormorantGaramond-Inf/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-LF.fd
new file mode 100644
index 00000000000..cc044f05a62
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-LF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-LF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-LF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-LF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{m}{sc}{
+      <-> ssub * CormorantGaramond-LF/regular/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{m}{n}{
+      <-> ssub * CormorantGaramond-LF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{m}{it}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bx}{n}{
+      <-> ssub * CormorantGaramond-LF/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-LF}{bx}{it}{
+      <-> ssub * CormorantGaramond-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-OsF.fd
new file mode 100644
index 00000000000..92567322f1b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-OsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-OsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-OsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-OsF/regular/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{m}{n}{
+      <-> ssub * CormorantGaramond-OsF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{m}{it}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-OsF/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-OsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Sup.fd
new file mode 100644
index 00000000000..5769dd91a4b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-Sup.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-Sup.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-Sup.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-Sup}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{m}{n}{
+      <-> ssub * CormorantGaramond-Sup/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{m}{it}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bx}{n}{
+      <-> ssub * CormorantGaramond-Sup/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-Sup}{bx}{it}{
+      <-> ssub * CormorantGaramond-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TLF.fd
new file mode 100644
index 00000000000..18976fbf527
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TLF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-TLF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-TLF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{m}{n}{
+      <-> ssub * CormorantGaramond-TLF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{m}{it}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TLF/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TLF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TOsF.fd
new file mode 100644
index 00000000000..558817b2fea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2ACormorantGaramond-TOsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2ACormorantGaramond-TOsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2A/CormorantGaramond-TOsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2A}{CormorantGaramond-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-t2a
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{m}{n}{
+      <-> ssub * CormorantGaramond-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{m}{it}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T2A}{CormorantGaramond-TOsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Inf.fd
new file mode 100644
index 00000000000..af409525444
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Inf.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-Inf.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-Inf.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-Inf}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{m}{n}{
+      <-> ssub * CormorantGaramond-Inf/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{m}{it}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bx}{n}{
+      <-> ssub * CormorantGaramond-Inf/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Inf}{bx}{it}{
+      <-> ssub * CormorantGaramond-Inf/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-LF.fd
new file mode 100644
index 00000000000..283c3f8be17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-LF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-LF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-LF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-LF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{m}{sc}{
+      <-> ssub * CormorantGaramond-LF/regular/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{m}{n}{
+      <-> ssub * CormorantGaramond-LF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{m}{it}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bx}{n}{
+      <-> ssub * CormorantGaramond-LF/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-LF}{bx}{it}{
+      <-> ssub * CormorantGaramond-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-OsF.fd
new file mode 100644
index 00000000000..5037f33a9bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-OsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-OsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-OsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-OsF/regular/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{m}{n}{
+      <-> ssub * CormorantGaramond-OsF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{m}{it}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-OsF/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-OsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Sup.fd
new file mode 100644
index 00000000000..8c867d499b0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-Sup.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-Sup.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-Sup.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-Sup}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{m}{n}{
+      <-> ssub * CormorantGaramond-Sup/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{m}{it}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bx}{n}{
+      <-> ssub * CormorantGaramond-Sup/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-Sup}{bx}{it}{
+      <-> ssub * CormorantGaramond-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TLF.fd
new file mode 100644
index 00000000000..53358157052
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TLF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-TLF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-TLF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{m}{n}{
+      <-> ssub * CormorantGaramond-TLF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{m}{it}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TLF/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TLF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TOsF.fd
new file mode 100644
index 00000000000..d3fd96f8aea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2BCormorantGaramond-TOsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2BCormorantGaramond-TOsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2B/CormorantGaramond-TOsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2B}{CormorantGaramond-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-t2b
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{m}{n}{
+      <-> ssub * CormorantGaramond-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{m}{it}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T2B}{CormorantGaramond-TOsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Inf.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Inf.fd
new file mode 100644
index 00000000000..5b13509c392
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Inf.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-Inf.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-Inf.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-Inf}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-inf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{light}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{l}{sl}{
+      <-> ssub * CormorantGaramond-Inf/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{l}{n}{
+      <-> ssub * CormorantGaramond-Inf/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{l}{it}{
+      <-> ssub * CormorantGaramond-Inf/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{m}{sl}{
+      <-> ssub * CormorantGaramond-Inf/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{m}{n}{
+      <-> ssub * CormorantGaramond-Inf/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{m}{it}{
+      <-> ssub * CormorantGaramond-Inf/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Inf/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{sb}{n}{
+      <-> ssub * CormorantGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{sb}{it}{
+      <-> ssub * CormorantGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{b}{sl}{
+      <-> ssub * CormorantGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{b}{n}{
+      <-> ssub * CormorantGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{b}{it}{
+      <-> ssub * CormorantGaramond-Inf/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bx}{n}{
+      <-> ssub * CormorantGaramond-Inf/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Inf/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Inf}{bx}{it}{
+      <-> ssub * CormorantGaramond-Inf/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-LF.fd
new file mode 100644
index 00000000000..b506741a09a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-LF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-LF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-LF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-LF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{l}{sc}{
+      <-> ssub * CormorantGaramond-LF/light/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{m}{sc}{
+      <-> ssub * CormorantGaramond-LF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{m}{n}{
+      <-> ssub * CormorantGaramond-LF/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{m}{it}{
+      <-> ssub * CormorantGaramond-LF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{b}{sc}{
+      <-> ssub * CormorantGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bx}{n}{
+      <-> ssub * CormorantGaramond-LF/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-LF}{bx}{it}{
+      <-> ssub * CormorantGaramond-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-OsF.fd
new file mode 100644
index 00000000000..c833c5f5949
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-OsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-OsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-OsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-OsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-OsF/light/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-OsF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{m}{n}{
+      <-> ssub * CormorantGaramond-OsF/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{m}{it}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-OsF/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-OsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Sup.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Sup.fd
new file mode 100644
index 00000000000..fd2728c781e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-Sup.fd
@@ -0,0 +1,164 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-Sup.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-Sup.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-Sup}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{regular}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bold}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{medium}{sl}{
+      <-> ssub * CormorantGaramond-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-sup-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{light}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{l}{sl}{
+      <-> ssub * CormorantGaramond-Sup/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{l}{n}{
+      <-> ssub * CormorantGaramond-Sup/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{l}{it}{
+      <-> ssub * CormorantGaramond-Sup/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{m}{sl}{
+      <-> ssub * CormorantGaramond-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{m}{n}{
+      <-> ssub * CormorantGaramond-Sup/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{m}{it}{
+      <-> ssub * CormorantGaramond-Sup/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{sb}{sl}{
+      <-> ssub * CormorantGaramond-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{sb}{n}{
+      <-> ssub * CormorantGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{sb}{it}{
+      <-> ssub * CormorantGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{b}{sl}{
+      <-> ssub * CormorantGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{b}{n}{
+      <-> ssub * CormorantGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{b}{it}{
+      <-> ssub * CormorantGaramond-Sup/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bx}{n}{
+      <-> ssub * CormorantGaramond-Sup/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bx}{sl}{
+      <-> ssub * CormorantGaramond-Sup/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-Sup}{bx}{it}{
+      <-> ssub * CormorantGaramond-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TLF.fd
new file mode 100644
index 00000000000..e9475c28899
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TLF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-TLF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-TLF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TLF/light/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{m}{n}{
+      <-> ssub * CormorantGaramond-TLF/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{m}{it}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TLF/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TLF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TOsF.fd
new file mode 100644
index 00000000000..9fe516090ec
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/T2CCormorantGaramond-TOsF.fd
@@ -0,0 +1,204 @@
+%% Generated by autoinst on 2019/06/24
+%%
+\ProvidesFile{T2CCormorantGaramond-TOsF.fd}
+    [2019/06/24 (autoinst)  Font definitions for T2C/CormorantGaramond-TOsF.]
+
+\expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
+    \let\CormorantGaramond@@scale\@empty
+\else
+    \edef\CormorantGaramond@@scale{s*[\csname CormorantGaramond@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T2C}{CormorantGaramond-TOsF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{regular}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{semibold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bold}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{medium}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{medium}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{medium}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{light}{sc}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-sc-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-t2c
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{l}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{m}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{m}{n}{
+      <-> ssub * CormorantGaramond-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{m}{it}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{sb}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{b}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bx}{n}{
+      <-> ssub * CormorantGaramond-TOsF/b/n
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bx}{sc}{
+      <-> ssub * CormorantGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T2C}{CormorantGaramond-TOsF}{bx}{it}{
+      <-> ssub * CormorantGaramond-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-LF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-LF.fd
index 366b6eb5ed4..09aa1b161e7 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{TS1CormorantGaramond-LF.fd}
-    [2016/08/15 (autoinst)  Font definitions for TS1/CormorantGaramond-LF.]
+    [2019/06/24 (autoinst)  Font definitions for TS1/CormorantGaramond-LF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{CormorantGaramond-LF}{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{sl}{
-      <-> ssub * CormorantGaramond-LF/l/it
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/it
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-lf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-LF/sb/it
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{mb}{it}{
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-LF/mb/it
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{light}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{sl}{
+      <-> ssub * CormorantGaramond-LF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{n}{
+      <-> ssub * CormorantGaramond-LF/light/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{l}{it}{
+      <-> ssub * CormorantGaramond-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{m}{sl}{
+      <-> ssub * CormorantGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-LF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-lf-ts1
+      <-> ssub * CormorantGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-LF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-lf-ts1
+      <-> ssub * CormorantGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{m}{sl}{
-      <-> ssub * CormorantGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-LF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-LF/b/sl
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{n}{
+      <-> ssub * CormorantGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{sb}{it}{
+      <-> ssub * CormorantGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{sl}{
+      <-> ssub * CormorantGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{n}{
+      <-> ssub * CormorantGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{b}{it}{
+      <-> ssub * CormorantGaramond-LF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-LF}{bx}{n}{
       <-> ssub * CormorantGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CormorantGaramond-LF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CormorantGaramond-LF}{bx}{it}{
       <-> ssub * CormorantGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-OsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-OsF.fd
index ac71946d320..35b4169e4da 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{TS1CormorantGaramond-OsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for TS1/CormorantGaramond-OsF.]
+    [2019/06/24 (autoinst)  Font definitions for TS1/CormorantGaramond-OsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{CormorantGaramond-OsF}{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-OsF/l/it
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/it
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-osf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/sb/it
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-OsF/mb/it
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-OsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{n}{
+      <-> ssub * CormorantGaramond-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{l}{it}{
+      <-> ssub * CormorantGaramond-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-OsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-osf-ts1
+      <-> ssub * CormorantGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-OsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-osf-ts1
+      <-> ssub * CormorantGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-OsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-OsF/b/sl
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{n}{
+      <-> ssub * CormorantGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{b}{it}{
+      <-> ssub * CormorantGaramond-OsF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-OsF}{bx}{n}{
       <-> ssub * CormorantGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CormorantGaramond-OsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CormorantGaramond-OsF}{bx}{it}{
       <-> ssub * CormorantGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TLF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TLF.fd
index aaaccb57e03..ecb40b5b9e1 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{TS1CormorantGaramond-TLF.fd}
-    [2016/08/15 (autoinst)  Font definitions for TS1/CormorantGaramond-TLF.]
+    [2019/06/24 (autoinst)  Font definitions for TS1/CormorantGaramond-TLF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{CormorantGaramond-TLF}{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TLF/l/it
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/it
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tlf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/sb/it
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TLF/mb/it
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{n}{
+      <-> ssub * CormorantGaramond-TLF/light/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{l}{it}{
+      <-> ssub * CormorantGaramond-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TLF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tlf-ts1
+      <-> ssub * CormorantGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TLF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tlf-ts1
+      <-> ssub * CormorantGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TLF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TLF/b/sl
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{n}{
+      <-> ssub * CormorantGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{b}{it}{
+      <-> ssub * CormorantGaramond-TLF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TLF}{bx}{n}{
       <-> ssub * CormorantGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CormorantGaramond-TLF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CormorantGaramond-TLF}{bx}{it}{
       <-> ssub * CormorantGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TOsF.fd
index d90c6354ae2..05a070401f9 100644
--- a/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/cormorantgaramond/TS1CormorantGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2016/08/15
+%% Generated by autoinst on 2019/06/24
 %%
 \ProvidesFile{TS1CormorantGaramond-TOsF.fd}
-    [2016/08/15 (autoinst)  Font definitions for TS1/CormorantGaramond-TOsF.]
+    [2019/06/24 (autoinst)  Font definitions for TS1/CormorantGaramond-TOsF.]
 
 \expandafter\ifx\csname CormorantGaramond@scale\endcsname\relax
     \let\CormorantGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{CormorantGaramond-TOsF}{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{regular}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{regular}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/l/it
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{regular}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{semibold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{semibold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/it
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBold-tosf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bold}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-SemiBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bold}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/sb/it
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bold}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{medium}{n}{
       <-> \CormorantGaramond@@scale CormorantGaramond-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{medium}{it}{
       <-> \CormorantGaramond@@scale CormorantGaramond-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{mb}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/mb/it
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{medium}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{light}{n}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{light}{it}{
+      <-> \CormorantGaramond@@scale CormorantGaramond-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{light}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   l --> light
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{n}{
+      <-> ssub * CormorantGaramond-TOsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{l}{it}{
+      <-> ssub * CormorantGaramond-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{m}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TOsF}{m}{n}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Regular-tosf-ts1
+      <-> ssub * CormorantGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TOsF}{m}{it}{
-      <-> \CormorantGaramond@@scale CormorantGaramond-Italic-tosf-ts1
+      <-> ssub * CormorantGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{m}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bx}{sl}{
-      <-> ssub * CormorantGaramond-TOsF/b/sl
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{n}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{sb}{it}{
+      <-> ssub * CormorantGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{n}{
+      <-> ssub * CormorantGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{b}{it}{
+      <-> ssub * CormorantGaramond-TOsF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bx}{n}{
       <-> ssub * CormorantGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bx}{sl}{
+      <-> ssub * CormorantGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{CormorantGaramond-TOsF}{bx}{it}{
       <-> ssub * CormorantGaramond-TOsF/b/it
 }{}