ebgaramond

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

27 files changed, 4220 insertions, 1203 deletions

diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
index 2f1d3a39ee4..d4f2d6403a7 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{LY1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ly1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ly1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
index 9a58edaaa52..3df35e16aba 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-LF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ly1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ly1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ly1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ly1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ly1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ly1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ly1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ly1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
index 569b05bf3e1..85961b67240 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ly1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ly1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ly1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ly1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
index 966664af735..513d5634376 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{LY1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ly1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ly1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
index d0dff7ecb2d..c71f78aced4 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ly1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ly1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ly1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ly1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ly1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ly1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ly1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ly1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
index bc6aa51f9b5..c7d1a0a7e9a 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{LY1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ly1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ly1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ly1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ly1
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ly1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{LY1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
index 010eff4e7b3..8b6348794e2 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/LY1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{LY1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for LY1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for LY1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{LY1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ly1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
index b73e504ad56..578961a4e68 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{OT1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-ot1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-ot1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
index 82f8c1fef5f..26c46170979 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-LF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-ot1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-ot1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ot1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ot1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-ot1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-ot1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-ot1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-ot1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
index cc181fb3bc8..7abacf15722 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-ot1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ot1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ot1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-ot1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
index c4a03698158..75cf4d7bd1f 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{OT1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-ot1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-ot1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
index 8f9b5ebf301..d9a156a4ea5 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-ot1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-ot1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ot1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ot1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-ot1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-ot1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-ot1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-ot1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
index a38595d0a45..8134f608184 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{OT1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-ot1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ot1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ot1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-ot1
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-ot1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{OT1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
index 6f7075b53ff..6adb4b1fd1d 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/OT1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{OT1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for OT1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for OT1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{OT1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ot1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
index 4a917a218e0..24ffb535a3f 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-Inf.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-Inf.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-Inf.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{EBGaramond-Inf}{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{sl}{
-      <-> ssub * EBGaramond-Inf/eb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{regular}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{b}{sl}{
-      <-> ssub * EBGaramond-Inf/b/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{bold}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{sl}{
-      <-> ssub * EBGaramond-Inf/sb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{semibold}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{mb}{sl}{
-      <-> ssub * EBGaramond-Inf/mb/it
+\DeclareFontShape{T1}{EBGaramond-Inf}{medium}{sl}{
+      <-> ssub * EBGaramond-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{m}{sl}{
+      <-> ssub * EBGaramond-Inf/regular/sl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-inf-t1
+      <-> ssub * EBGaramond-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-inf-t1
+      <-> ssub * EBGaramond-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{m}{sl}{
-      <-> ssub * EBGaramond-Inf/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{sl}{
+      <-> ssub * EBGaramond-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Inf}{bx}{sl}{
-      <-> ssub * EBGaramond-Inf/b/sl
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{n}{
+      <-> ssub * EBGaramond-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{sb}{it}{
+      <-> ssub * EBGaramond-Inf/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{sl}{
+      <-> ssub * EBGaramond-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{n}{
+      <-> ssub * EBGaramond-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{b}{it}{
+      <-> ssub * EBGaramond-Inf/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{sl}{
+      <-> ssub * EBGaramond-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{n}{
+      <-> ssub * EBGaramond-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Inf}{eb}{it}{
+      <-> ssub * EBGaramond-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Inf}{bx}{n}{
       <-> ssub * EBGaramond-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-Inf}{bx}{sl}{
+      <-> ssub * EBGaramond-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-Inf}{bx}{it}{
       <-> ssub * EBGaramond-Inf/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
index e13b319a268..950a2111c34 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{T1}{EBGaramond-LF}{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scsl}{
-      <-> ssub * EBGaramond-LF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-LF/eb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scsl}{
-      <-> ssub * EBGaramond-LF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-LF/sb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{scsl}{
-      <-> ssub * EBGaramond-LF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{scsl}{
+      <-> ssub * EBGaramond-LF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-LF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-LF/mb/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{scsl}{
+      <-> ssub * EBGaramond-LF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-titling-t1
+      <-> ssub * EBGaramond-LF/regular/tl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-sc-t1
+      <-> ssub * EBGaramond-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-t1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-t1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-swash-t1
+      <-> ssub * EBGaramond-LF/regular/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{m}{tlsl}{
+      <-> ssub * EBGaramond-LF/regular/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-sc-t1
+      <-> ssub * EBGaramond-LF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-titling-t1
+      <-> ssub * EBGaramond-LF/regular/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-swash-t1
+      <-> ssub * EBGaramond-LF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{scsl}{
-      <-> ssub * EBGaramond-LF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scsl}{
+      <-> ssub * EBGaramond-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tl}{
+      <-> ssub * EBGaramond-LF/semibold/tl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{m}{tlsl}{
-      <-> ssub * EBGaramond-LF/m/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sc}{
+      <-> ssub * EBGaramond-LF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{scsl}{
-      <-> ssub * EBGaramond-LF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tl}{
-      <-> ssub * EBGaramond-LF/b/tl
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{sc}{
-      <-> ssub * EBGaramond-LF/b/sc
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sw}{
+      <-> ssub * EBGaramond-LF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-LF/semibold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{scit}{
+      <-> ssub * EBGaramond-LF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{tlit}{
+      <-> ssub * EBGaramond-LF/semibold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{sb}{nw}{
+      <-> ssub * EBGaramond-LF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{scsl}{
+      <-> ssub * EBGaramond-LF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tl}{
+      <-> ssub * EBGaramond-LF/bold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sc}{
+      <-> ssub * EBGaramond-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sw}{
+      <-> ssub * EBGaramond-LF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlsl}{
+      <-> ssub * EBGaramond-LF/bold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{scit}{
+      <-> ssub * EBGaramond-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{tlit}{
+      <-> ssub * EBGaramond-LF/bold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{b}{nw}{
+      <-> ssub * EBGaramond-LF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scsl}{
+      <-> ssub * EBGaramond-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tl}{
+      <-> ssub * EBGaramond-LF/extrabold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sc}{
+      <-> ssub * EBGaramond-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sw}{
+      <-> ssub * EBGaramond-LF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-LF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{scit}{
+      <-> ssub * EBGaramond-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{tlit}{
+      <-> ssub * EBGaramond-LF/extrabold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{eb}{nw}{
+      <-> ssub * EBGaramond-LF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{sc}{
+      <-> ssub * EBGaramond-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tl}{
+      <-> ssub * EBGaramond-LF/b/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{scsl}{
+      <-> ssub * EBGaramond-LF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-LF/b/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-LF/b/tlsl
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlit}{
+      <-> ssub * EBGaramond-LF/b/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{scit}{
       <-> ssub * EBGaramond-LF/b/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlit}{
-      <-> ssub * EBGaramond-LF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-LF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-LF/b/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-LF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
index 8e3020d4010..26c9ffd2c3d 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{T1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-OsF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-OsF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-OsF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-OsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scsl}{
+      <-> ssub * EBGaramond-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-sc-t1
+      <-> ssub * EBGaramond-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-t1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-t1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sw}{
+      <-> ssub * EBGaramond-OsF/regular/sw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scit}{
+      <-> ssub * EBGaramond-OsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-swash-t1
+      <-> ssub * EBGaramond-OsF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{scsl}{
-      <-> ssub * EBGaramond-OsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sc}{
+      <-> ssub * EBGaramond-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-OsF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{sc}{
-      <-> ssub * EBGaramond-OsF/b/sc
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sw}{
+      <-> ssub * EBGaramond-OsF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{scit}{
+      <-> ssub * EBGaramond-OsF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{sb}{nw}{
+      <-> ssub * EBGaramond-OsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scsl}{
+      <-> ssub * EBGaramond-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sc}{
+      <-> ssub * EBGaramond-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sw}{
+      <-> ssub * EBGaramond-OsF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{scit}{
+      <-> ssub * EBGaramond-OsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{b}{nw}{
+      <-> ssub * EBGaramond-OsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sc}{
+      <-> ssub * EBGaramond-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sw}{
+      <-> ssub * EBGaramond-OsF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{scit}{
+      <-> ssub * EBGaramond-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{eb}{nw}{
+      <-> ssub * EBGaramond-OsF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{sc}{
+      <-> ssub * EBGaramond-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-OsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-OsF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
index 90ded2f1c39..102305dcdbd 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-Sup.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-Sup.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-Sup.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{T1}{EBGaramond-Sup}{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{sl}{
-      <-> ssub * EBGaramond-Sup/eb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{regular}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{b}{sl}{
-      <-> ssub * EBGaramond-Sup/b/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{bold}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{sl}{
-      <-> ssub * EBGaramond-Sup/sb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{semibold}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{mb}{sl}{
-      <-> ssub * EBGaramond-Sup/mb/it
+\DeclareFontShape{T1}{EBGaramond-Sup}{medium}{sl}{
+      <-> ssub * EBGaramond-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{extrabold}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{m}{sl}{
+      <-> ssub * EBGaramond-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-sup-t1
+      <-> ssub * EBGaramond-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-sup-t1
+      <-> ssub * EBGaramond-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{m}{sl}{
-      <-> ssub * EBGaramond-Sup/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{sl}{
+      <-> ssub * EBGaramond-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-Sup}{bx}{sl}{
-      <-> ssub * EBGaramond-Sup/b/sl
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{n}{
+      <-> ssub * EBGaramond-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{sb}{it}{
+      <-> ssub * EBGaramond-Sup/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{sl}{
+      <-> ssub * EBGaramond-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{n}{
+      <-> ssub * EBGaramond-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{b}{it}{
+      <-> ssub * EBGaramond-Sup/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{sl}{
+      <-> ssub * EBGaramond-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{n}{
+      <-> ssub * EBGaramond-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-Sup}{eb}{it}{
+      <-> ssub * EBGaramond-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-Sup}{bx}{n}{
       <-> ssub * EBGaramond-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-Sup}{bx}{sl}{
+      <-> ssub * EBGaramond-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-Sup}{bx}{it}{
       <-> ssub * EBGaramond-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
index 176a8fb32e6..00932a3a4ab 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,242 +11,448 @@
 
 \DeclareFontFamily{T1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TLF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/eb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{regular}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tl}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tl}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tl}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TLF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/sb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{semibold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tl}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tl}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sc}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tlit}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tlit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-titling-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TLF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TLF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{medium}{tlsl}{
+      <-> ssub * EBGaramond-TLF/medium/tlit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tl}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tlit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-titling-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{mb}{tlsl}{
-      <-> ssub * EBGaramond-TLF/mb/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{extrabold}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{scsl}{
+      <-> ssub * EBGaramond-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{tl}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-titling-t1
+      <-> ssub * EBGaramond-TLF/regular/tl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-sc-t1
+      <-> ssub * EBGaramond-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-t1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-t1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-swash-t1
+      <-> ssub * EBGaramond-TLF/regular/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlsl}{
+      <-> ssub * EBGaramond-TLF/regular/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-sc-t1
+      <-> ssub * EBGaramond-TLF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-titling-t1
+      <-> ssub * EBGaramond-TLF/regular/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-swash-t1
+      <-> ssub * EBGaramond-TLF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{scsl}{
-      <-> ssub * EBGaramond-TLF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tl}{
+      <-> ssub * EBGaramond-TLF/semibold/tl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{m}{tlsl}{
-      <-> ssub * EBGaramond-TLF/m/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sc}{
+      <-> ssub * EBGaramond-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TLF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tl}{
-      <-> ssub * EBGaramond-TLF/b/tl
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{sc}{
-      <-> ssub * EBGaramond-TLF/b/sc
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sw}{
+      <-> ssub * EBGaramond-TLF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/semibold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{scit}{
+      <-> ssub * EBGaramond-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{tlit}{
+      <-> ssub * EBGaramond-TLF/semibold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{sb}{nw}{
+      <-> ssub * EBGaramond-TLF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scsl}{
+      <-> ssub * EBGaramond-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tl}{
+      <-> ssub * EBGaramond-TLF/bold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sc}{
+      <-> ssub * EBGaramond-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sw}{
+      <-> ssub * EBGaramond-TLF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlsl}{
+      <-> ssub * EBGaramond-TLF/bold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{scit}{
+      <-> ssub * EBGaramond-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{tlit}{
+      <-> ssub * EBGaramond-TLF/bold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{b}{nw}{
+      <-> ssub * EBGaramond-TLF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sc}{
+      <-> ssub * EBGaramond-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sw}{
+      <-> ssub * EBGaramond-TLF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlsl}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{scit}{
+      <-> ssub * EBGaramond-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{tlit}{
+      <-> ssub * EBGaramond-TLF/extrabold/tlit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{eb}{nw}{
+      <-> ssub * EBGaramond-TLF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{sc}{
+      <-> ssub * EBGaramond-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tl}{
+      <-> ssub * EBGaramond-TLF/b/tl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TLF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
@@ -259,16 +465,16 @@
       <-> ssub * EBGaramond-TLF/b/sl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlsl}{
-      <-> ssub * EBGaramond-TLF/b/tlsl
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlit}{
+      <-> ssub * EBGaramond-TLF/b/tlit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{scit}{
       <-> ssub * EBGaramond-TLF/b/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlit}{
-      <-> ssub * EBGaramond-TLF/b/tlit
+\DeclareFontShape{T1}{EBGaramond-TLF}{bx}{tlsl}{
+      <-> ssub * EBGaramond-TLF/b/tlsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TLF}{bx}{nw}{
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
index 319289bf61a..d46b633f7bf 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,178 +11,336 @@
 
 \DeclareFontFamily{T1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/eb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sc}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sc}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{scit}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{nw}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/sb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sc}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sc}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{n}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{scit}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{scit}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sw}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{nw}{
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{nw}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-swash-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{scsl}{
-      <-> ssub * EBGaramond-TOsF/mb/scit
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{scsl}{
+      <-> ssub * EBGaramond-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sc}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{scit}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{nw}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scsl}{
+      <-> ssub * EBGaramond-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sc}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-sc-t1
+      <-> ssub * EBGaramond-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-t1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-t1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scit}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sw}{
+      <-> ssub * EBGaramond-TOsF/regular/sw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sw}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-swash-t1
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scit}{
+      <-> ssub * EBGaramond-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{m}{nw}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-swash-t1
+      <-> ssub * EBGaramond-TOsF/regular/nw
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{scsl}{
-      <-> ssub * EBGaramond-TOsF/m/scit
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sc}{
+      <-> ssub * EBGaramond-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{scsl}{
-      <-> ssub * EBGaramond-TOsF/b/scsl
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{sc}{
-      <-> ssub * EBGaramond-TOsF/b/sc
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sw}{
+      <-> ssub * EBGaramond-TOsF/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{scit}{
+      <-> ssub * EBGaramond-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{sb}{nw}{
+      <-> ssub * EBGaramond-TOsF/semibold/nw
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scsl}{
+      <-> ssub * EBGaramond-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sc}{
+      <-> ssub * EBGaramond-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sw}{
+      <-> ssub * EBGaramond-TOsF/bold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{scit}{
+      <-> ssub * EBGaramond-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{b}{nw}{
+      <-> ssub * EBGaramond-TOsF/bold/nw
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scsl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sc}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{scit}{
+      <-> ssub * EBGaramond-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{eb}{nw}{
+      <-> ssub * EBGaramond-TOsF/extrabold/nw
 }{}
 
 \DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{sc}{
+      <-> ssub * EBGaramond-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{scsl}{
+      <-> ssub * EBGaramond-TOsF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
index 1020c52c94d..fed21cce302 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/T1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{T1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for T1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for T1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{T1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{T1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-t1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
index 1dad2ff5536..f5f00a922f3 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-LF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-LF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-LF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-LF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{sl}{
-      <-> ssub * EBGaramond-LF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{regular}{sl}{
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{b}{sl}{
-      <-> ssub * EBGaramond-LF/b/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{bold}{sl}{
+      <-> ssub * EBGaramond-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{sl}{
-      <-> ssub * EBGaramond-LF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{semibold}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{mb}{sl}{
-      <-> ssub * EBGaramond-LF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-LF}{medium}{sl}{
+      <-> ssub * EBGaramond-LF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{m}{sl}{
+      <-> ssub * EBGaramond-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-lf-ts1
+      <-> ssub * EBGaramond-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-lf-ts1
+      <-> ssub * EBGaramond-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{m}{sl}{
-      <-> ssub * EBGaramond-LF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{sl}{
+      <-> ssub * EBGaramond-LF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-LF}{bx}{sl}{
-      <-> ssub * EBGaramond-LF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{n}{
+      <-> ssub * EBGaramond-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{sb}{it}{
+      <-> ssub * EBGaramond-LF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{sl}{
+      <-> ssub * EBGaramond-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{n}{
+      <-> ssub * EBGaramond-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{b}{it}{
+      <-> ssub * EBGaramond-LF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{sl}{
+      <-> ssub * EBGaramond-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{n}{
+      <-> ssub * EBGaramond-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-LF}{eb}{it}{
+      <-> ssub * EBGaramond-LF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-LF}{bx}{n}{
       <-> ssub * EBGaramond-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-LF}{bx}{sl}{
+      <-> ssub * EBGaramond-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-LF}{bx}{it}{
       <-> ssub * EBGaramond-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
index 49364da855b..9e5447163ee 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-OsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-OsF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-OsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-OsF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{sl}{
-      <-> ssub * EBGaramond-OsF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{regular}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{sl}{
-      <-> ssub * EBGaramond-OsF/b/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bold}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{sl}{
-      <-> ssub * EBGaramond-OsF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{mb}{sl}{
-      <-> ssub * EBGaramond-OsF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-OsF}{medium}{sl}{
+      <-> ssub * EBGaramond-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{m}{sl}{
+      <-> ssub * EBGaramond-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-osf-ts1
+      <-> ssub * EBGaramond-OsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-osf-ts1
+      <-> ssub * EBGaramond-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{m}{sl}{
-      <-> ssub * EBGaramond-OsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{sl}{
+      <-> ssub * EBGaramond-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{sl}{
-      <-> ssub * EBGaramond-OsF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{n}{
+      <-> ssub * EBGaramond-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{sb}{it}{
+      <-> ssub * EBGaramond-OsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{sl}{
+      <-> ssub * EBGaramond-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{n}{
+      <-> ssub * EBGaramond-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{b}{it}{
+      <-> ssub * EBGaramond-OsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{sl}{
+      <-> ssub * EBGaramond-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{n}{
+      <-> ssub * EBGaramond-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-OsF}{eb}{it}{
+      <-> ssub * EBGaramond-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{n}{
       <-> ssub * EBGaramond-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{sl}{
+      <-> ssub * EBGaramond-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-OsF}{bx}{it}{
       <-> ssub * EBGaramond-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
index f58a9fbc96a..366d84d19dc 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-TLF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-TLF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{sl}{
-      <-> ssub * EBGaramond-TLF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{regular}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{sl}{
-      <-> ssub * EBGaramond-TLF/b/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bold}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{sl}{
-      <-> ssub * EBGaramond-TLF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{mb}{sl}{
-      <-> ssub * EBGaramond-TLF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-TLF}{medium}{sl}{
+      <-> ssub * EBGaramond-TLF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{m}{sl}{
+      <-> ssub * EBGaramond-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tlf-ts1
+      <-> ssub * EBGaramond-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tlf-ts1
+      <-> ssub * EBGaramond-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{m}{sl}{
-      <-> ssub * EBGaramond-TLF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{sl}{
+      <-> ssub * EBGaramond-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{sl}{
-      <-> ssub * EBGaramond-TLF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{n}{
+      <-> ssub * EBGaramond-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{sb}{it}{
+      <-> ssub * EBGaramond-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{sl}{
+      <-> ssub * EBGaramond-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{n}{
+      <-> ssub * EBGaramond-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{b}{it}{
+      <-> ssub * EBGaramond-TLF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{sl}{
+      <-> ssub * EBGaramond-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{n}{
+      <-> ssub * EBGaramond-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TLF}{eb}{it}{
+      <-> ssub * EBGaramond-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{n}{
       <-> ssub * EBGaramond-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{sl}{
+      <-> ssub * EBGaramond-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-TLF}{bx}{it}{
       <-> ssub * EBGaramond-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
index 6ef946beb80..49a0ee85a5a 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramond-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramond-TOsF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramond-TOsF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramond-TOsF.]
 
 \expandafter\ifx\csname EBGaramond@scale\endcsname\relax
     \let\EBGaramond@@scale\@empty
@@ -11,74 +11,152 @@
 
 \DeclareFontFamily{TS1}{EBGaramond-TOsF}{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{n}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{n}{
+      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{it}{
-      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{it}{
+      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{sl}{
-      <-> ssub * EBGaramond-TOsF/eb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{regular}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{n}{
       <-> \EBGaramond@@scale EBGaramond-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{it}{
       <-> \EBGaramond@@scale EBGaramond-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bold}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{n}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{n}{
       <-> \EBGaramond@@scale EBGaramond-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{it}{
       <-> \EBGaramond@@scale EBGaramond-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{sl}{
-      <-> ssub * EBGaramond-TOsF/sb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{semibold}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{n}{
       <-> \EBGaramond@@scale EBGaramond-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{it}{
       <-> \EBGaramond@@scale EBGaramond-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{mb}{sl}{
-      <-> ssub * EBGaramond-TOsF/mb/it
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{medium}{sl}{
+      <-> ssub * EBGaramond-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{n}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{it}{
+      <-> \EBGaramond@@scale EBGaramond-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{extrabold}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
+}{}
+
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{sl}{
+      <-> ssub * EBGaramond-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{n}{
-      <-> \EBGaramond@@scale EBGaramond-Regular-tosf-ts1
+      <-> ssub * EBGaramond-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{it}{
-      <-> \EBGaramond@@scale EBGaramond-Italic-tosf-ts1
+      <-> ssub * EBGaramond-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{m}{sl}{
-      <-> ssub * EBGaramond-TOsF/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{sl}{
+      <-> ssub * EBGaramond-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{sl}{
-      <-> ssub * EBGaramond-TOsF/b/sl
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{n}{
+      <-> ssub * EBGaramond-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{sb}{it}{
+      <-> ssub * EBGaramond-TOsF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{sl}{
+      <-> ssub * EBGaramond-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{n}{
+      <-> ssub * EBGaramond-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{b}{it}{
+      <-> ssub * EBGaramond-TOsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{sl}{
+      <-> ssub * EBGaramond-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{n}{
+      <-> ssub * EBGaramond-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{eb}{it}{
+      <-> ssub * EBGaramond-TOsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{n}{
       <-> ssub * EBGaramond-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{sl}{
+      <-> ssub * EBGaramond-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{EBGaramond-TOsF}{bx}{it}{
       <-> ssub * EBGaramond-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
index bc715e1febe..5b378780be9 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
+++ b/Master/texmf-dist/tex/latex/ebgaramond/TS1EBGaramondInitials-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/11/30
+%% Generated by autoinst on 2019/04/07
 %%
 \ProvidesFile{TS1EBGaramondInitials-TLF.fd}
-    [2018/11/30 (autoinst)  Font definitions for TS1/EBGaramondInitials-TLF.]
+    [2019/04/07 (autoinst)  Font definitions for TS1/EBGaramondInitials-TLF.]
 
 \expandafter\ifx\csname EBGaramondInitials@scale\endcsname\relax
     \let\EBGaramondInitials@@scale\@empty
@@ -11,8 +11,21 @@
 
 \DeclareFontFamily{TS1}{EBGaramondInitials-TLF}{}
 
-\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{m}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{regular}{n}{
       <-> \EBGaramondInitials@@scale EBGaramondInitials-tlf-ts1
 }{}
 
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{EBGaramondInitials-TLF}{m}{n}{
+      <-> ssub * EBGaramondInitials-TLF/regular/n
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
index 7cfd7dfbb0c..3e93c61ef26 100644
--- a/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
+++ b/Master/texmf-dist/tex/latex/ebgaramond/ebgaramond.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ebgaramond}
-    [2018/11/30 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
+    [2018/04/07 (Bob Tennent and autoinst)  Style file for EB Garamond fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -81,16 +81,17 @@
     \def\ebgaramond@figurealign{}
   \fi
   \ifebgaramond@medium
-    \def\mdseries@rm{mb}
+    \def\mdseries@rm{medium}
   \else
-    \def\mdseries@rm{m}
+    \def\mdseries@rm{regular}
   \fi
+  \def\seriesdefault{\mdseries@rm}
   \ifebgaramond@semibold
-    \def\bfseries@rm{sb}
+    \def\bfseries@rm{semibold}
   \else\ifebgaramond@extrabold
-    \def\bfseries@rm{eb}
+    \def\bfseries@rm{extrabold}
   \else
-    \def\bfseries@rm{b}
+    \def\bfseries@rm{bold}
   \fi\fi
 
 \fi
@@ -178,7 +179,7 @@
   \fa@naming@exception{shape}{{it}{sw}}{sw}
 
 
-  \def\initials{\fontfamily{EBGaramondInitials-TLF}\fontseries{m}\selectfont}
+  \def\initials{\fontfamily{EBGaramondInitials-TLF}\fontseries{regular}\selectfont}
   \DeclareTextFontCommand{\oldstylenums}{\fontfamily{EBGaramond-\ebgaramond@figurealign OsF}\selectfont}
   \DeclareTextFontCommand{\liningnums}{\fontfamily{EBGaramond-\ebgaramond@figurealign LF}\selectfont}
   \DeclareTextFontCommand{\textin}{\initials}