alegreya (9oct19)

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

58 files changed, 14540 insertions, 3073 deletions

diff --git a/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty b/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty
index 92e4a386c91..ac7e0508061 100644
--- a/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty
+++ b/Master/texmf-dist/tex/latex/alegreya/Alegreya.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{Alegreya}[%
-   2018/08/02 (Bob Tennent)  Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] 
+   2019/10/08 (Bob Tennent)  Supports Alegreya and AlegreyaSC fonts for all LaTeX engines. ] 
 
 \RequirePackage{ifxetex,ifluatex,textcomp}
 
@@ -15,6 +15,8 @@
 \newif\ifAlegreya@lining \Alegreya@liningtrue
 \newif\ifAlegreya@tabular \Alegreya@tabularfalse
 \newif\ifAlegreya@black \Alegreya@blackfalse
+\newif\ifAlegreya@extrabold \Alegreya@extraboldfalse
+\newif\ifAlegreya@medium \Alegreya@mediumfalse
 
 \newcommand*{\Alegreya@scale}{1}  
 \RequirePackage{xkeyval}
@@ -83,13 +85,9 @@
 \fi
 }
 
-\def\bfseries@rm{b}\def\Alegreya@boldstyle{Bold}
-\DeclareOptionX{black}{\edef\bfseries@rm{k}\edef\Alegreya@boldstyle{Black}}
-\DeclareOptionX{extrabold}{\edef\bfseries@rm{eb}\edef\Alegreya@boldstyle{ExtraBold}}
-
-\def\mdseries@rm{m}\def\Alegreya@regstyle{Regular}
-\DeclareOptionX{medium}{\edef\mdseries@rm{mb}\edef\Alegreya@regstyle{Medium}}
-\def\seriesdefault{\mdseries@rm}
+\DeclareOptionX{black}{\Alegreya@blacktrue} 
+\DeclareOptionX{extrabold}{\Alegreya@extraboldtrue}
+\DeclareOptionX{medium}{\Alegreya@mediumtrue}
 
 \ProcessOptionsX\relax
 
@@ -104,6 +102,16 @@
   \else
     \def\Alegreya@figurealign{Proportional}
   \fi
+  \def\Alegreya@boldstyle{Bold}
+  \ifAlegreya@extrabold
+    \def\Alegreya@boldstyle{ExtraBold}
+  \else\ifAlegreya@black
+    \def\Alegreya@boldstyle{Black}
+  \fi\fi
+  \def\Alegreya@regstyle{Regular}
+  \ifAlegreya@medium
+    \def\Alegreya@regstyle{Medium}
+  \fi
 
 \else % type1
 
@@ -117,6 +125,20 @@
   \else
     \def\Alegreya@figurealign{}
   \fi
+
+  \def\bfseries@rm{bold}
+  \ifAlegreya@extrabold
+    \def\bfseries@rm{extrabold}
+  \else\ifAlegreya@black
+    \def\bfseries@rm{black}
+  \fi\fi
+
+  \def\mdseries@rm{regular}
+  \ifAlegreya@medium
+    \def\mdseries@rm{medium}
+  \fi
+  \def\seriesdefault{\mdseries@rm}
+ 
 \fi
 
 
@@ -137,7 +159,8 @@
   \setmainfont
       [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle},
         UprightFont    = *-\Alegreya@regstyle ,
-        ItalicFont     = *-\ifx\Alegreya@regstyle\Alegreya@regular Italic\else\Alegreya@regstyle Italic\fi ,
+        ItalicFont     = *-Italic,
+%*-\ifx\Alegreya@regstyle\Alegreya@regular Italic\else\Alegreya@regstyle Italic\fi ,
         BoldFont       = *-\Alegreya@boldstyle , 
         BoldItalicFont = *-\Alegreya@boldstyle Italic ,
       ]
@@ -212,6 +235,14 @@
           BoldItalicFont = *-\Alegreya@boldstyle Italic ,
         ]
       {Alegreya}
+  \newfontfamily\AlegreyaExtraBold
+      [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle},
+        UprightFont    = *-ExtraBold ,
+        ItalicFont     = *-ExtraBoldItalic ,
+        BoldFont       = *-ExtraBold ,
+        BoldItalicFont = *-ExtraBoldItalic ,
+      ]
+      {Alegreya}
   \newfontfamily\AlegreyaBlack
       [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle},
         UprightFont    = *-Black ,
@@ -220,7 +251,6 @@
         BoldItalicFont = *-BlackItalic ,
       ]
       {Alegreya}
-
   \newfontfamily\AlegreyaMedium
       [ Numbers = {\Alegreya@figurealign,\Alegreya@figurestyle},
         UprightFont    = *-Medium ,
@@ -243,8 +273,9 @@
   \def\AlegreyaOsF{\fontfamily{Alegreya-OsF}\selectfont}
   \def\AlegreyaTLF{\fontfamily{Alegreya-TLF}\selectfont}
   \def\AlegreyaTOsF{\fontfamily{Alegreya-TOsF}\selectfont}
-  \def\AlegreyaBlack{\fontfamily{\Alegreyafamily}\fontseries{k}\selectfont}
-  \def\AlegreyaMedium{\fontfamily{\Alegreyafamily}\fontseries{mb}\selectfont}
+  \def\AlegreyaExtraBold{\fontfamily{\Alegreyafamily}\fontseries{extrabold}\selectfont}
+  \def\AlegreyaBlack{\fontfamily{\Alegreyafamily}\fontseries{black}\selectfont}
+  \def\AlegreyaMedium{\fontfamily{\Alegreyafamily}\fontseries{medium}\selectfont}
 
   \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
   \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
diff --git a/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty b/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
index 3e184b5ee01..68159d41f64 100644
--- a/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
+++ b/Master/texmf-dist/tex/latex/alegreya/AlegreyaSans.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{AlegreyaSans}[%
-   2019/03/07 (Bob Tennent)  Supports AlegreyaSans fonts for all LaTeX engines. ] 
+   2019/10/08 (Bob Tennent)  Supports AlegreyaSans fonts for all LaTeX engines. ] 
 
 \RequirePackage{ifxetex,ifluatex,textcomp}
 
@@ -14,7 +14,12 @@
 
 \newif\ifAlegreyaSans@lining \AlegreyaSans@liningtrue
 \newif\ifAlegreyaSans@tabular \AlegreyaSans@tabularfalse
+
 \newif\ifAlegreyaSans@black \AlegreyaSans@blackfalse
+\newif\ifAlegreyaSans@extrabold \AlegreyaSans@extraboldfalse
+\newif\ifAlegreyaSans@medium \AlegreyaSans@mediumfalse
+\newif\ifAlegreyaSans@thin \AlegreyaSans@thinfalse
+\newif\ifAlegreyaSans@light \AlegreyaSans@lightfalse
 
 \newcommand*{\AlegreyaSans@scale}{1}  
 \RequirePackage{xkeyval}
@@ -86,14 +91,12 @@
 \fi
 }
 
-\def\bfseries@sf{b}\def\AlegreyaSans@boldstyle{Bold}
-\DeclareOptionX{black}{\edef\bfseries@sf{k}\edef\AlegreyaSans@boldstyle{Black}}
-\DeclareOptionX{extrabold}{\edef\bfseries@sf{eb}\edef\AlegreyaSans@boldstyle{ExtraBold}}
+\DeclareOptionX{black}{\AlegreyaSans@blacktrue}
+\DeclareOptionX{extrabold}{\AlegreyaSans@extraboldtrue}
 
-\def\mdseries@sf{m}\def\AlegreyaSans@regularstyle{Regular}
-\DeclareOptionX{thin}{\edef\mdseries@sf{t}\edef\AlegreyaSans@regularstyle{Thin}}
-\DeclareOptionX{light}{\edef\mdseries@sf{l}\edef\AlegreyaSans@regularstyle{Light}}
-\DeclareOptionX{medium}{\edef\mdseries@sf{mb}\edef\AlegreyaSans@regularstyle{Medium}}
+\DeclareOptionX{thin}{\AlegreyaSans@thintrue}
+\DeclareOptionX{light}{\AlegreyaSans@lighttrue}
+\DeclareOptionX{medium}{\AlegreyaSans@mediumtrue}
 
 \ProcessOptionsX\relax
 
@@ -109,6 +112,22 @@
     \def\AlegreyaSans@figurealign{Proportional}
   \fi
 
+  \def\AlegreyaSans@regularstyle{Regular}
+  \ifAlegreyaSans@medium
+    \def\AlegreyaSans@regularstyle{Medium}
+  \else\ifAlegreyaSans@thin
+    \def\AlegreyaSans@regularstyle{Thin}
+  \else\ifAlegreyaSans@light
+    \def\AlegreyaSans@regularstyle{Light}
+  \fi\fi\fi
+     
+  \def\AlegreyaSans@boldstyle{Bold}
+  \ifAlegreyaSans@extrabold
+    \def\AlegreyaSans@boldstyle{ExtraBold}
+  \else\ifAlegreyaSans@black
+    \def\AlegreyaSans@boldstyle{Black}
+  \fi\fi
+
 \else % type1
 
   \ifAlegreyaSans@lining
@@ -121,6 +140,23 @@
   \else
     \def\AlegreyaSans@figurealign{}
   \fi
+
+  \def\bfseries@sf{bold}
+  \ifAlegreyaSans@extrabold
+    \def\bfseries@sf{extrabold}
+  \else\ifAlegreyaSans@black
+    \def\bfseries@sf{black}
+  \fi\fi
+
+  \def\mdseries@sf{regular}
+  \ifAlegreyaSans@medium
+    \def\mdseries@sf{medium}
+  \else\ifAlegreyaSans@light
+    \def\mdseries@sf{light}
+  \else\ifAlegreyaSans@thin
+    \def\mdseries@sf{thin}
+  \fi\fi\fi
+
 \fi
 
 
@@ -273,11 +309,11 @@
   \def\AlegreyaSansOsF{\fontfamily{AlegreyaSans-OsF}\selectfont}
   \def\AlegreyaSansTLF{\fontfamily{AlegreyaSans-TLF}\selectfont}
   \def\AlegreyaSansTOsF{\fontfamily{AlegreyaSans-TOsF}\selectfont}
-  \def\AlegreyaSansThin{\fontfamily{\AlegreyaSansfamily}\fontseries{i}\selectfont}
-  \def\AlegreyaSansLight{\fontfamily{\AlegreyaSansfamily}\fontseries{l}\selectfont}
-  \def\AlegreyaSansMedium{\fontfamily{\AlegreyaSansfamily}\fontseries{mb}\selectfont}
-  \def\AlegreyaSansExtraBold{\fontfamily{\AlegreyaSansfamily}\fontseries{eb}\selectfont}
-  \def\AlegreyaSansBlack{\fontfamily{\AlegreyaSansfamily}\fontseries{k}\selectfont}
+  \def\AlegreyaSansThin{\fontfamily{\AlegreyaSansfamily}\fontseries{thin}\selectfont}
+  \def\AlegreyaSansLight{\fontfamily{\AlegreyaSansfamily}\fontseries{light}\selectfont}
+  \def\AlegreyaSansMedium{\fontfamily{\AlegreyaSansfamily}\fontseries{medium}\selectfont}
+  \def\AlegreyaSansExtraBold{\fontfamily{\AlegreyaSansfamily}\fontseries{extrabold}\selectfont}
+  \def\AlegreyaSansBlack{\fontfamily{\AlegreyaSansfamily}\fontseries{black}\selectfont}
 
   \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
   \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Inf.fd
index e6c09ca41ce..af1ad5fa84f 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-Inf.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{LGR}{Alegreya-Inf}{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{sl}{
-      <-> ssub * Alegreya-Inf/eb/it
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{regular}{sl}{
+      <-> ssub * Alegreya-Inf/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{k}{sl}{
-      <-> ssub * Alegreya-Inf/k/it
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{black}{sl}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{b}{sl}{
-      <-> ssub * Alegreya-Inf/b/it
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bold}{sl}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{mb}{sl}{
-      <-> ssub * Alegreya-Inf/mb/it
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{medium}{sl}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{extrabold}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{m}{sl}{
+      <-> ssub * Alegreya-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{m}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{m}{sc}{
+      <-> ssub * Alegreya-Inf/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Inf}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-inf-lgr
+      <-> ssub * Alegreya-Inf/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Inf}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-inf-lgr
+      <-> ssub * Alegreya-Inf/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{m}{sl}{
-      <-> ssub * Alegreya-Inf/m/it
+\DeclareFontShape{LGR}{Alegreya-Inf}{m}{scit}{
+      <-> ssub * Alegreya-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Inf}{bx}{sl}{
-      <-> ssub * Alegreya-Inf/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{sl}{
+      <-> ssub * Alegreya-Inf/medium/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{sc}{
+      <-> ssub * Alegreya-Inf/medium/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{n}{
+      <-> ssub * Alegreya-Inf/medium/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{it}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{sb}{scit}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{sl}{
+      <-> ssub * Alegreya-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{sc}{
+      <-> ssub * Alegreya-Inf/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{n}{
+      <-> ssub * Alegreya-Inf/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{it}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{b}{scit}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{sc}{
+      <-> ssub * Alegreya-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{n}{
+      <-> ssub * Alegreya-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{it}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{eb}{scit}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{sl}{
+      <-> ssub * Alegreya-Inf/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{sc}{
+      <-> ssub * Alegreya-Inf/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{n}{
+      <-> ssub * Alegreya-Inf/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{it}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{ub}{scit}{
+      <-> ssub * Alegreya-Inf/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Inf}{bx}{n}{
       <-> ssub * Alegreya-Inf/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-Inf}{bx}{sc}{
+      <-> ssub * Alegreya-Inf/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bx}{scsl}{
+      <-> ssub * Alegreya-Inf/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Inf}{bx}{sl}{
+      <-> ssub * Alegreya-Inf/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-Inf}{bx}{it}{
       <-> ssub * Alegreya-Inf/b/it
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-Inf}{bx}{scit}{
+      <-> ssub * Alegreya-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-LF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-LF.fd
index 422d1e40180..bcc8ed4c9e1 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-LF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-LF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LGR}{Alegreya-LF}{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{scsl}{
-      <-> ssub * Alegreya-LF/eb/scit
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{eb}{sl}{
-      <-> ssub * Alegreya-LF/eb/it
+\DeclareFontShape{LGR}{Alegreya-LF}{regular}{sl}{
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-lf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Black-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{scsl}{
-      <-> ssub * Alegreya-LF/k/scit
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{scsl}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{k}{sl}{
-      <-> ssub * Alegreya-LF/k/it
+\DeclareFontShape{LGR}{Alegreya-LF}{black}{sl}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-lf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{scsl}{
-      <-> ssub * Alegreya-LF/b/scit
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{b}{sl}{
-      <-> ssub * Alegreya-LF/b/it
+\DeclareFontShape{LGR}{Alegreya-LF}{bold}{sl}{
+      <-> ssub * Alegreya-LF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-lf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{medium}{sl}{
+      <-> ssub * Alegreya-LF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{scsl}{
-      <-> ssub * Alegreya-LF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{mb}{sl}{
-      <-> ssub * Alegreya-LF/mb/it
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{extrabold}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-LF}{m}{sl}{
+      <-> ssub * Alegreya-LF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{m}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-LF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-sc-lgr
+      <-> ssub * Alegreya-LF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-LF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-lgr
+      <-> ssub * Alegreya-LF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-LF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-lgr
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-LF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-sc-lgr
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{m}{scsl}{
-      <-> ssub * Alegreya-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{sl}{
+      <-> ssub * Alegreya-LF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{m}{sl}{
-      <-> ssub * Alegreya-LF/m/it
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{bx}{sl}{
-      <-> ssub * Alegreya-LF/b/sl
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{sc}{
+      <-> ssub * Alegreya-LF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{bx}{scsl}{
-      <-> ssub * Alegreya-LF/b/scsl
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{n}{
+      <-> ssub * Alegreya-LF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-LF}{bx}{sc}{
-      <-> ssub * Alegreya-LF/b/sc
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{it}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{sb}{scit}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{sl}{
+      <-> ssub * Alegreya-LF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{sc}{
+      <-> ssub * Alegreya-LF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{n}{
+      <-> ssub * Alegreya-LF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{it}{
+      <-> ssub * Alegreya-LF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{b}{scit}{
+      <-> ssub * Alegreya-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{sc}{
+      <-> ssub * Alegreya-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{n}{
+      <-> ssub * Alegreya-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{it}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{eb}{scit}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{sl}{
+      <-> ssub * Alegreya-LF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{scsl}{
+      <-> ssub * Alegreya-LF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{sc}{
+      <-> ssub * Alegreya-LF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{n}{
+      <-> ssub * Alegreya-LF/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{it}{
+      <-> ssub * Alegreya-LF/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{ub}{scit}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-LF}{bx}{n}{
       <-> ssub * Alegreya-LF/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-LF}{bx}{sc}{
+      <-> ssub * Alegreya-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{bx}{scsl}{
+      <-> ssub * Alegreya-LF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-LF}{bx}{sl}{
+      <-> ssub * Alegreya-LF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-LF}{bx}{it}{
       <-> ssub * Alegreya-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-OsF.fd
index 148d869cb1b..4db35897c4b 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-OsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LGR}{Alegreya-OsF}{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{scsl}{
-      <-> ssub * Alegreya-OsF/eb/scit
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{sl}{
-      <-> ssub * Alegreya-OsF/eb/it
+\DeclareFontShape{LGR}{Alegreya-OsF}{regular}{sl}{
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-osf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Black-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{scsl}{
-      <-> ssub * Alegreya-OsF/k/scit
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{k}{sl}{
-      <-> ssub * Alegreya-OsF/k/it
+\DeclareFontShape{LGR}{Alegreya-OsF}{black}{sl}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-osf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scit
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{b}{sl}{
-      <-> ssub * Alegreya-OsF/b/it
+\DeclareFontShape{LGR}{Alegreya-OsF}{bold}{sl}{
+      <-> ssub * Alegreya-OsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-osf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{medium}{sl}{
+      <-> ssub * Alegreya-OsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{scsl}{
-      <-> ssub * Alegreya-OsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{mb}{sl}{
-      <-> ssub * Alegreya-OsF/mb/it
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{m}{sl}{
+      <-> ssub * Alegreya-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{m}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-OsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-sc-lgr
+      <-> ssub * Alegreya-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-OsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-lgr
+      <-> ssub * Alegreya-OsF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-OsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-lgr
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-OsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-sc-lgr
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{m}{scsl}{
-      <-> ssub * Alegreya-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{sl}{
+      <-> ssub * Alegreya-OsF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{m}{sl}{
-      <-> ssub * Alegreya-OsF/m/it
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{sl}{
-      <-> ssub * Alegreya-OsF/b/sl
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{sc}{
+      <-> ssub * Alegreya-OsF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scsl
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{n}{
+      <-> ssub * Alegreya-OsF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{sc}{
-      <-> ssub * Alegreya-OsF/b/sc
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{it}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{sb}{scit}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{sl}{
+      <-> ssub * Alegreya-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{sc}{
+      <-> ssub * Alegreya-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{n}{
+      <-> ssub * Alegreya-OsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{it}{
+      <-> ssub * Alegreya-OsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{b}{scit}{
+      <-> ssub * Alegreya-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{sc}{
+      <-> ssub * Alegreya-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{n}{
+      <-> ssub * Alegreya-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{it}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{eb}{scit}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{sl}{
+      <-> ssub * Alegreya-OsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{sc}{
+      <-> ssub * Alegreya-OsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{n}{
+      <-> ssub * Alegreya-OsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{it}{
+      <-> ssub * Alegreya-OsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{ub}{scit}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-OsF}{bx}{n}{
       <-> ssub * Alegreya-OsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{sc}{
+      <-> ssub * Alegreya-OsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{scsl}{
+      <-> ssub * Alegreya-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-OsF}{bx}{sl}{
+      <-> ssub * Alegreya-OsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-OsF}{bx}{it}{
       <-> ssub * Alegreya-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Sup.fd
index 0f08e58d80f..c8580e2296c 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-Sup.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{LGR}{Alegreya-Sup}{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{sl}{
-      <-> ssub * Alegreya-Sup/eb/it
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{regular}{sl}{
+      <-> ssub * Alegreya-Sup/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{k}{sl}{
-      <-> ssub * Alegreya-Sup/k/it
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{black}{sl}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{b}{sl}{
-      <-> ssub * Alegreya-Sup/b/it
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bold}{sl}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{mb}{sl}{
-      <-> ssub * Alegreya-Sup/mb/it
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{medium}{sl}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{extrabold}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{m}{sl}{
+      <-> ssub * Alegreya-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{m}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{m}{sc}{
+      <-> ssub * Alegreya-Sup/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Sup}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-sup-lgr
+      <-> ssub * Alegreya-Sup/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Sup}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-sup-lgr
+      <-> ssub * Alegreya-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{m}{sl}{
-      <-> ssub * Alegreya-Sup/m/it
+\DeclareFontShape{LGR}{Alegreya-Sup}{m}{scit}{
+      <-> ssub * Alegreya-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-Sup}{bx}{sl}{
-      <-> ssub * Alegreya-Sup/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{sl}{
+      <-> ssub * Alegreya-Sup/medium/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{sc}{
+      <-> ssub * Alegreya-Sup/medium/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{n}{
+      <-> ssub * Alegreya-Sup/medium/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{it}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{sb}{scit}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{sl}{
+      <-> ssub * Alegreya-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{sc}{
+      <-> ssub * Alegreya-Sup/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{n}{
+      <-> ssub * Alegreya-Sup/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{it}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{b}{scit}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{sc}{
+      <-> ssub * Alegreya-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{n}{
+      <-> ssub * Alegreya-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{it}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{eb}{scit}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{sl}{
+      <-> ssub * Alegreya-Sup/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{sc}{
+      <-> ssub * Alegreya-Sup/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{n}{
+      <-> ssub * Alegreya-Sup/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{it}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{ub}{scit}{
+      <-> ssub * Alegreya-Sup/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-Sup}{bx}{n}{
       <-> ssub * Alegreya-Sup/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-Sup}{bx}{sc}{
+      <-> ssub * Alegreya-Sup/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bx}{scsl}{
+      <-> ssub * Alegreya-Sup/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-Sup}{bx}{sl}{
+      <-> ssub * Alegreya-Sup/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-Sup}{bx}{it}{
       <-> ssub * Alegreya-Sup/b/it
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-Sup}{bx}{scit}{
+      <-> ssub * Alegreya-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TLF.fd
index f8e0c55ed2f..08c5f60e648 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-TLF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LGR}{Alegreya-TLF}{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{scsl}{
-      <-> ssub * Alegreya-TLF/eb/scit
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{sl}{
-      <-> ssub * Alegreya-TLF/eb/it
+\DeclareFontShape{LGR}{Alegreya-TLF}{regular}{sl}{
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tlf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{scsl}{
-      <-> ssub * Alegreya-TLF/k/scit
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{k}{sl}{
-      <-> ssub * Alegreya-TLF/k/it
+\DeclareFontShape{LGR}{Alegreya-TLF}{black}{sl}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tlf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scit
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{b}{sl}{
-      <-> ssub * Alegreya-TLF/b/it
+\DeclareFontShape{LGR}{Alegreya-TLF}{bold}{sl}{
+      <-> ssub * Alegreya-TLF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tlf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{medium}{sl}{
+      <-> ssub * Alegreya-TLF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{scsl}{
-      <-> ssub * Alegreya-TLF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{mb}{sl}{
-      <-> ssub * Alegreya-TLF/mb/it
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{m}{sl}{
+      <-> ssub * Alegreya-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{m}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TLF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-sc-lgr
+      <-> ssub * Alegreya-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TLF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-lgr
+      <-> ssub * Alegreya-TLF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TLF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-lgr
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TLF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-sc-lgr
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{m}{scsl}{
-      <-> ssub * Alegreya-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{sl}{
+      <-> ssub * Alegreya-TLF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{m}{sl}{
-      <-> ssub * Alegreya-TLF/m/it
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{sl}{
-      <-> ssub * Alegreya-TLF/b/sl
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{sc}{
+      <-> ssub * Alegreya-TLF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scsl
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{n}{
+      <-> ssub * Alegreya-TLF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{sc}{
-      <-> ssub * Alegreya-TLF/b/sc
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{it}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{sb}{scit}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{sl}{
+      <-> ssub * Alegreya-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{sc}{
+      <-> ssub * Alegreya-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{n}{
+      <-> ssub * Alegreya-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{it}{
+      <-> ssub * Alegreya-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{b}{scit}{
+      <-> ssub * Alegreya-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{sc}{
+      <-> ssub * Alegreya-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{n}{
+      <-> ssub * Alegreya-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{it}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{eb}{scit}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{sl}{
+      <-> ssub * Alegreya-TLF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{sc}{
+      <-> ssub * Alegreya-TLF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{n}{
+      <-> ssub * Alegreya-TLF/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{it}{
+      <-> ssub * Alegreya-TLF/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{ub}{scit}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TLF}{bx}{n}{
       <-> ssub * Alegreya-TLF/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{sc}{
+      <-> ssub * Alegreya-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{scsl}{
+      <-> ssub * Alegreya-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TLF}{bx}{sl}{
+      <-> ssub * Alegreya-TLF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-TLF}{bx}{it}{
       <-> ssub * Alegreya-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TOsF.fd
index 254ffd56085..09ef9f137d1 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreya-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreya-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/Alegreya-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/Alegreya-TOsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LGR}{Alegreya-TOsF}{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{scsl}{
-      <-> ssub * Alegreya-TOsF/eb/scit
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{sl}{
-      <-> ssub * Alegreya-TOsF/eb/it
+\DeclareFontShape{LGR}{Alegreya-TOsF}{regular}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tosf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{n}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{it}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{scsl}{
-      <-> ssub * Alegreya-TOsF/k/scit
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{k}{sl}{
-      <-> ssub * Alegreya-TOsF/k/it
+\DeclareFontShape{LGR}{Alegreya-TOsF}{black}{sl}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tosf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{n}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{it}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scit
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{sl}{
-      <-> ssub * Alegreya-TOsF/b/it
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bold}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tosf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{n}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{it}{
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{medium}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{scsl}{
-      <-> ssub * Alegreya-TOsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{mb}{sl}{
-      <-> ssub * Alegreya-TOsF/mb/it
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-lgr
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{m}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{m}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TOsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-sc-lgr
+      <-> ssub * Alegreya-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TOsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-lgr
+      <-> ssub * Alegreya-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TOsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-lgr
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TOsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-sc-lgr
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{m}{scsl}{
-      <-> ssub * Alegreya-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{m}{sl}{
-      <-> ssub * Alegreya-TOsF/m/it
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{sl}{
-      <-> ssub * Alegreya-TOsF/b/sl
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{sc}{
+      <-> ssub * Alegreya-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scsl
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{n}{
+      <-> ssub * Alegreya-TOsF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{sc}{
-      <-> ssub * Alegreya-TOsF/b/sc
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{it}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{sb}{scit}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{sc}{
+      <-> ssub * Alegreya-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{n}{
+      <-> ssub * Alegreya-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{it}{
+      <-> ssub * Alegreya-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{b}{scit}{
+      <-> ssub * Alegreya-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{sc}{
+      <-> ssub * Alegreya-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{n}{
+      <-> ssub * Alegreya-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{it}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{eb}{scit}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{sl}{
+      <-> ssub * Alegreya-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{sc}{
+      <-> ssub * Alegreya-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{n}{
+      <-> ssub * Alegreya-TOsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{it}{
+      <-> ssub * Alegreya-TOsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{ub}{scit}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{n}{
       <-> ssub * Alegreya-TOsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{sc}{
+      <-> ssub * Alegreya-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{scsl}{
+      <-> ssub * Alegreya-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{sl}{
+      <-> ssub * Alegreya-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{Alegreya-TOsF}{bx}{it}{
       <-> ssub * Alegreya-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Inf.fd
index c85d33ce9bb..d5ec349f03e 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-Inf.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-Inf}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{sl}{
-      <-> ssub * AlegreyaSans-Inf/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{k}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{k}{sl}{
-      <-> ssub * AlegreyaSans-Inf/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-inf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{black}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-inf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{light}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-inf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{sc}{
+      <-> ssub * AlegreyaSans-Inf/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{n}{
+      <-> ssub * AlegreyaSans-Inf/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{it}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{el}{scit}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{sc}{
+      <-> ssub * AlegreyaSans-Inf/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{n}{
+      <-> ssub * AlegreyaSans-Inf/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{it}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{l}{scit}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{sc}{
+      <-> ssub * AlegreyaSans-Inf/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-lgr
+      <-> ssub * AlegreyaSans-Inf/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-lgr
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{sl}{
-      <-> ssub * AlegreyaSans-Inf/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{m}{scit}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-lgr
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{i}{sl}{
-      <-> ssub * AlegreyaSans-Inf/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{n}{
+      <-> ssub * AlegreyaSans-Inf/medium/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{it}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{sc}{
+      <-> ssub * AlegreyaSans-Inf/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{n}{
+      <-> ssub * AlegreyaSans-Inf/bold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{it}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{b}{scit}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{n}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{it}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Inf/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{n}{
+      <-> ssub * AlegreyaSans-Inf/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{it}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{n}{
       <-> ssub * AlegreyaSans-Inf/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Inf/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Inf/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{it}{
       <-> ssub * AlegreyaSans-Inf/b/it
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-Inf}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-LF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-LF.fd
index 565614f427d..3df6422ac40 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-LF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-LF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-LF}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-LF/l/scit
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{sl}{
-      <-> ssub * AlegreyaSans-LF/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/eb/scit
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-LF/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{black}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-LF/k/scit
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{k}{sl}{
-      <-> ssub * AlegreyaSans-LF/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scit
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{light}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{sc}{
+      <-> ssub * AlegreyaSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{n}{
+      <-> ssub * AlegreyaSans-LF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{it}{
+      <-> ssub * AlegreyaSans-LF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{el}{scit}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{sc}{
+      <-> ssub * AlegreyaSans-LF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{n}{
+      <-> ssub * AlegreyaSans-LF/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{it}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{l}{scit}{
+      <-> ssub * AlegreyaSans-LF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-LF/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-lgr
+      <-> ssub * AlegreyaSans-LF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-lgr
+      <-> ssub * AlegreyaSans-LF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-lgr
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-lgr
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{m}{sl}{
-      <-> ssub * AlegreyaSans-LF/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-LF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{n}{
+      <-> ssub * AlegreyaSans-LF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{it}{
+      <-> ssub * AlegreyaSans-LF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-LF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{i}{sl}{
-      <-> ssub * AlegreyaSans-LF/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{sc}{
+      <-> ssub * AlegreyaSans-LF/bold/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scsl
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{n}{
+      <-> ssub * AlegreyaSans-LF/bold/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-LF/b/sc
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{it}{
+      <-> ssub * AlegreyaSans-LF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{b}{scit}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{n}{
+      <-> ssub * AlegreyaSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{it}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-LF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{n}{
+      <-> ssub * AlegreyaSans-LF/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{it}{
+      <-> ssub * AlegreyaSans-LF/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{n}{
       <-> ssub * AlegreyaSans-LF/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-LF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-LF}{bx}{it}{
       <-> ssub * AlegreyaSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-OsF.fd
index 519f1ac8705..80bafce6d1d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-OsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-OsF}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/l/scit
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-OsF/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/eb/scit
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/k/scit
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-OsF/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scit
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{n}{
+      <-> ssub * AlegreyaSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{it}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{n}{
+      <-> ssub * AlegreyaSans-OsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{it}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-lgr
+      <-> ssub * AlegreyaSans-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-lgr
+      <-> ssub * AlegreyaSans-OsF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-lgr
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-lgr
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-OsF/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-OsF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-OsF/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-OsF/bold/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scsl
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{n}{
+      <-> ssub * AlegreyaSans-OsF/bold/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-OsF/b/sc
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{it}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-OsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-OsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{n}{
       <-> ssub * AlegreyaSans-OsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-OsF}{bx}{it}{
       <-> ssub * AlegreyaSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Sup.fd
index c00fa4d5503..61d649d312d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-Sup.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-Sup}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{sl}{
-      <-> ssub * AlegreyaSans-Sup/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{k}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{k}{sl}{
-      <-> ssub * AlegreyaSans-Sup/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-sup-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{black}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{light}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-sup-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{sc}{
+      <-> ssub * AlegreyaSans-Sup/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{n}{
+      <-> ssub * AlegreyaSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{it}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{el}{scit}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{sc}{
+      <-> ssub * AlegreyaSans-Sup/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{n}{
+      <-> ssub * AlegreyaSans-Sup/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{it}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{l}{scit}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{sc}{
+      <-> ssub * AlegreyaSans-Sup/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-lgr
+      <-> ssub * AlegreyaSans-Sup/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-lgr
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{sl}{
-      <-> ssub * AlegreyaSans-Sup/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{m}{scit}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-lgr
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{i}{sl}{
-      <-> ssub * AlegreyaSans-Sup/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{n}{
+      <-> ssub * AlegreyaSans-Sup/medium/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{it}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{sc}{
+      <-> ssub * AlegreyaSans-Sup/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{n}{
+      <-> ssub * AlegreyaSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{it}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{b}{scit}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{n}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{it}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Sup/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{n}{
+      <-> ssub * AlegreyaSans-Sup/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{it}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{n}{
       <-> ssub * AlegreyaSans-Sup/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Sup/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{it}{
       <-> ssub * AlegreyaSans-Sup/b/it
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-Sup}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TLF.fd
index a8832319258..2003a26b479 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-TLF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-TLF}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/l/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TLF/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/eb/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/k/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TLF/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{n}{
+      <-> ssub * AlegreyaSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{it}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{n}{
+      <-> ssub * AlegreyaSans-TLF/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{it}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-lgr
+      <-> ssub * AlegreyaSans-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-lgr
+      <-> ssub * AlegreyaSans-TLF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-lgr
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-lgr
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TLF/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TLF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TLF/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TLF/bold/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scsl
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{n}{
+      <-> ssub * AlegreyaSans-TLF/bold/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TLF/b/sc
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{it}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TLF/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TLF/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{n}{
       <-> ssub * AlegreyaSans-TLF/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-TLF}{bx}{it}{
       <-> ssub * AlegreyaSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TOsF.fd
index 7b70fbf5665..094b71e6e17 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LGRAlegreyaSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LGRAlegreyaSans-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LGR/AlegreyaSans-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for LGR/AlegreyaSans-TOsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LGR}{AlegreyaSans-TOsF}{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/l/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/l/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-lgr
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/k/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/k/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scit
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{n}{
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{it}{
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-lgr
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{n}{
+      <-> ssub * AlegreyaSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{it}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{n}{
+      <-> ssub * AlegreyaSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{it}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-lgr
+      <-> ssub * AlegreyaSans-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-lgr
+      <-> ssub * AlegreyaSans-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-lgr
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-lgr
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/m/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/medium/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/i/it
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/sl
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scsl
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{n}{
+      <-> ssub * AlegreyaSans-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TOsF/b/sc
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{it}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{n}{
       <-> ssub * AlegreyaSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{AlegreyaSans-TOsF}{bx}{it}{
       <-> ssub * AlegreyaSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Inf.fd
index 13904caa0e0..0e1ab6d8b5e 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-Inf.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{LY1}{Alegreya-Inf}{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{sl}{
-      <-> ssub * Alegreya-Inf/eb/it
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{regular}{sl}{
+      <-> ssub * Alegreya-Inf/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{k}{sl}{
-      <-> ssub * Alegreya-Inf/k/it
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{black}{sl}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{b}{sl}{
-      <-> ssub * Alegreya-Inf/b/it
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bold}{sl}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{mb}{sl}{
-      <-> ssub * Alegreya-Inf/mb/it
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{medium}{sl}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{extrabold}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{m}{sl}{
+      <-> ssub * Alegreya-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{m}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{m}{sc}{
+      <-> ssub * Alegreya-Inf/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Inf}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-inf-ly1
+      <-> ssub * Alegreya-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Inf}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-inf-ly1
+      <-> ssub * Alegreya-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{m}{sl}{
-      <-> ssub * Alegreya-Inf/m/it
+\DeclareFontShape{LY1}{Alegreya-Inf}{m}{scit}{
+      <-> ssub * Alegreya-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Inf}{bx}{sl}{
-      <-> ssub * Alegreya-Inf/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{sl}{
+      <-> ssub * Alegreya-Inf/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{sc}{
+      <-> ssub * Alegreya-Inf/medium/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{n}{
+      <-> ssub * Alegreya-Inf/medium/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{it}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{sb}{scit}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{sl}{
+      <-> ssub * Alegreya-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{sc}{
+      <-> ssub * Alegreya-Inf/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{n}{
+      <-> ssub * Alegreya-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{it}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{b}{scit}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{sc}{
+      <-> ssub * Alegreya-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{n}{
+      <-> ssub * Alegreya-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{it}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{eb}{scit}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{sl}{
+      <-> ssub * Alegreya-Inf/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{sc}{
+      <-> ssub * Alegreya-Inf/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{n}{
+      <-> ssub * Alegreya-Inf/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{it}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{ub}{scit}{
+      <-> ssub * Alegreya-Inf/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Inf}{bx}{n}{
       <-> ssub * Alegreya-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-Inf}{bx}{sc}{
+      <-> ssub * Alegreya-Inf/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bx}{scsl}{
+      <-> ssub * Alegreya-Inf/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Inf}{bx}{sl}{
+      <-> ssub * Alegreya-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-Inf}{bx}{it}{
       <-> ssub * Alegreya-Inf/b/it
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-Inf}{bx}{scit}{
+      <-> ssub * Alegreya-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-LF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-LF.fd
index 3e60b236a0e..3dfaa38fa70 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-LF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-LF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LY1}{Alegreya-LF}{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{scsl}{
-      <-> ssub * Alegreya-LF/eb/scit
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{eb}{sl}{
-      <-> ssub * Alegreya-LF/eb/it
+\DeclareFontShape{LY1}{Alegreya-LF}{regular}{sl}{
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-lf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{scsl}{
-      <-> ssub * Alegreya-LF/k/scit
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{scsl}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{k}{sl}{
-      <-> ssub * Alegreya-LF/k/it
+\DeclareFontShape{LY1}{Alegreya-LF}{black}{sl}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-lf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{scsl}{
-      <-> ssub * Alegreya-LF/b/scit
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{b}{sl}{
-      <-> ssub * Alegreya-LF/b/it
+\DeclareFontShape{LY1}{Alegreya-LF}{bold}{sl}{
+      <-> ssub * Alegreya-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-lf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{medium}{sl}{
+      <-> ssub * Alegreya-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{scsl}{
-      <-> ssub * Alegreya-LF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{mb}{sl}{
-      <-> ssub * Alegreya-LF/mb/it
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{extrabold}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-LF}{m}{sl}{
+      <-> ssub * Alegreya-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{m}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-LF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-sc-ly1
+      <-> ssub * Alegreya-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-LF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-ly1
+      <-> ssub * Alegreya-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-LF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-ly1
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-LF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-sc-ly1
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{m}{scsl}{
-      <-> ssub * Alegreya-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{sl}{
+      <-> ssub * Alegreya-LF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{m}{sl}{
-      <-> ssub * Alegreya-LF/m/it
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{bx}{sl}{
-      <-> ssub * Alegreya-LF/b/sl
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{sc}{
+      <-> ssub * Alegreya-LF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{bx}{scsl}{
-      <-> ssub * Alegreya-LF/b/scsl
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{n}{
+      <-> ssub * Alegreya-LF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-LF}{bx}{sc}{
-      <-> ssub * Alegreya-LF/b/sc
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{it}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{sb}{scit}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{sl}{
+      <-> ssub * Alegreya-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{sc}{
+      <-> ssub * Alegreya-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{n}{
+      <-> ssub * Alegreya-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{it}{
+      <-> ssub * Alegreya-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{b}{scit}{
+      <-> ssub * Alegreya-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{sc}{
+      <-> ssub * Alegreya-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{n}{
+      <-> ssub * Alegreya-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{it}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{eb}{scit}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{sl}{
+      <-> ssub * Alegreya-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{scsl}{
+      <-> ssub * Alegreya-LF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{sc}{
+      <-> ssub * Alegreya-LF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{n}{
+      <-> ssub * Alegreya-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{it}{
+      <-> ssub * Alegreya-LF/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{ub}{scit}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-LF}{bx}{n}{
       <-> ssub * Alegreya-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-LF}{bx}{sc}{
+      <-> ssub * Alegreya-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{bx}{scsl}{
+      <-> ssub * Alegreya-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-LF}{bx}{sl}{
+      <-> ssub * Alegreya-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-LF}{bx}{it}{
       <-> ssub * Alegreya-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-OsF.fd
index 76b23e74dd1..46b3fd36bc4 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-OsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LY1}{Alegreya-OsF}{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{scsl}{
-      <-> ssub * Alegreya-OsF/eb/scit
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{sl}{
-      <-> ssub * Alegreya-OsF/eb/it
+\DeclareFontShape{LY1}{Alegreya-OsF}{regular}{sl}{
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-osf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{scsl}{
-      <-> ssub * Alegreya-OsF/k/scit
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{k}{sl}{
-      <-> ssub * Alegreya-OsF/k/it
+\DeclareFontShape{LY1}{Alegreya-OsF}{black}{sl}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scit
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{b}{sl}{
-      <-> ssub * Alegreya-OsF/b/it
+\DeclareFontShape{LY1}{Alegreya-OsF}{bold}{sl}{
+      <-> ssub * Alegreya-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-osf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{medium}{sl}{
+      <-> ssub * Alegreya-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{scsl}{
-      <-> ssub * Alegreya-OsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{mb}{sl}{
-      <-> ssub * Alegreya-OsF/mb/it
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{m}{sl}{
+      <-> ssub * Alegreya-OsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{m}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-OsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-sc-ly1
+      <-> ssub * Alegreya-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-OsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-ly1
+      <-> ssub * Alegreya-OsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-OsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-ly1
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-OsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-sc-ly1
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{m}{scsl}{
-      <-> ssub * Alegreya-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{sl}{
+      <-> ssub * Alegreya-OsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{m}{sl}{
-      <-> ssub * Alegreya-OsF/m/it
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{sl}{
-      <-> ssub * Alegreya-OsF/b/sl
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{sc}{
+      <-> ssub * Alegreya-OsF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scsl
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{n}{
+      <-> ssub * Alegreya-OsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{sc}{
-      <-> ssub * Alegreya-OsF/b/sc
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{it}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{sb}{scit}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{sl}{
+      <-> ssub * Alegreya-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{sc}{
+      <-> ssub * Alegreya-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{n}{
+      <-> ssub * Alegreya-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{it}{
+      <-> ssub * Alegreya-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{b}{scit}{
+      <-> ssub * Alegreya-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{sc}{
+      <-> ssub * Alegreya-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{n}{
+      <-> ssub * Alegreya-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{it}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{eb}{scit}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{sl}{
+      <-> ssub * Alegreya-OsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{sc}{
+      <-> ssub * Alegreya-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{n}{
+      <-> ssub * Alegreya-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{it}{
+      <-> ssub * Alegreya-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{ub}{scit}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-OsF}{bx}{n}{
       <-> ssub * Alegreya-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{sc}{
+      <-> ssub * Alegreya-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{scsl}{
+      <-> ssub * Alegreya-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-OsF}{bx}{sl}{
+      <-> ssub * Alegreya-OsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-OsF}{bx}{it}{
       <-> ssub * Alegreya-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Sup.fd
index b12eb9fa82f..73bc5cdf4b8 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-Sup.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{LY1}{Alegreya-Sup}{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{sl}{
-      <-> ssub * Alegreya-Sup/eb/it
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{regular}{sl}{
+      <-> ssub * Alegreya-Sup/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{k}{sl}{
-      <-> ssub * Alegreya-Sup/k/it
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{black}{sl}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{b}{sl}{
-      <-> ssub * Alegreya-Sup/b/it
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bold}{sl}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{mb}{sl}{
-      <-> ssub * Alegreya-Sup/mb/it
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{medium}{sl}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{extrabold}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{m}{sl}{
+      <-> ssub * Alegreya-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{m}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{m}{sc}{
+      <-> ssub * Alegreya-Sup/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Sup}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-sup-ly1
+      <-> ssub * Alegreya-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Sup}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-sup-ly1
+      <-> ssub * Alegreya-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{m}{sl}{
-      <-> ssub * Alegreya-Sup/m/it
+\DeclareFontShape{LY1}{Alegreya-Sup}{m}{scit}{
+      <-> ssub * Alegreya-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-Sup}{bx}{sl}{
-      <-> ssub * Alegreya-Sup/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{sl}{
+      <-> ssub * Alegreya-Sup/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{sc}{
+      <-> ssub * Alegreya-Sup/medium/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{n}{
+      <-> ssub * Alegreya-Sup/medium/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{it}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{sb}{scit}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{sl}{
+      <-> ssub * Alegreya-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{sc}{
+      <-> ssub * Alegreya-Sup/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{n}{
+      <-> ssub * Alegreya-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{it}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{b}{scit}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{sc}{
+      <-> ssub * Alegreya-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{n}{
+      <-> ssub * Alegreya-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{it}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{eb}{scit}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{sl}{
+      <-> ssub * Alegreya-Sup/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{sc}{
+      <-> ssub * Alegreya-Sup/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{n}{
+      <-> ssub * Alegreya-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{it}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{ub}{scit}{
+      <-> ssub * Alegreya-Sup/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-Sup}{bx}{n}{
       <-> ssub * Alegreya-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-Sup}{bx}{sc}{
+      <-> ssub * Alegreya-Sup/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bx}{scsl}{
+      <-> ssub * Alegreya-Sup/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-Sup}{bx}{sl}{
+      <-> ssub * Alegreya-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-Sup}{bx}{it}{
       <-> ssub * Alegreya-Sup/b/it
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-Sup}{bx}{scit}{
+      <-> ssub * Alegreya-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TLF.fd
index 9163a5187d2..b30ae9d3e4d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-TLF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LY1}{Alegreya-TLF}{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{scsl}{
-      <-> ssub * Alegreya-TLF/eb/scit
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{sl}{
-      <-> ssub * Alegreya-TLF/eb/it
+\DeclareFontShape{LY1}{Alegreya-TLF}{regular}{sl}{
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tlf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{scsl}{
-      <-> ssub * Alegreya-TLF/k/scit
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{k}{sl}{
-      <-> ssub * Alegreya-TLF/k/it
+\DeclareFontShape{LY1}{Alegreya-TLF}{black}{sl}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scit
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{b}{sl}{
-      <-> ssub * Alegreya-TLF/b/it
+\DeclareFontShape{LY1}{Alegreya-TLF}{bold}{sl}{
+      <-> ssub * Alegreya-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tlf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{medium}{sl}{
+      <-> ssub * Alegreya-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{scsl}{
-      <-> ssub * Alegreya-TLF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{mb}{sl}{
-      <-> ssub * Alegreya-TLF/mb/it
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{m}{sl}{
+      <-> ssub * Alegreya-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{m}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TLF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-sc-ly1
+      <-> ssub * Alegreya-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TLF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-ly1
+      <-> ssub * Alegreya-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TLF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-ly1
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TLF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-sc-ly1
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{m}{scsl}{
-      <-> ssub * Alegreya-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{sl}{
+      <-> ssub * Alegreya-TLF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{m}{sl}{
-      <-> ssub * Alegreya-TLF/m/it
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{sl}{
-      <-> ssub * Alegreya-TLF/b/sl
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{sc}{
+      <-> ssub * Alegreya-TLF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scsl
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{n}{
+      <-> ssub * Alegreya-TLF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{sc}{
-      <-> ssub * Alegreya-TLF/b/sc
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{it}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{sb}{scit}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{sl}{
+      <-> ssub * Alegreya-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{sc}{
+      <-> ssub * Alegreya-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{n}{
+      <-> ssub * Alegreya-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{it}{
+      <-> ssub * Alegreya-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{b}{scit}{
+      <-> ssub * Alegreya-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{sc}{
+      <-> ssub * Alegreya-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{n}{
+      <-> ssub * Alegreya-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{it}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{eb}{scit}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{sl}{
+      <-> ssub * Alegreya-TLF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{sc}{
+      <-> ssub * Alegreya-TLF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{n}{
+      <-> ssub * Alegreya-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{it}{
+      <-> ssub * Alegreya-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{ub}{scit}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TLF}{bx}{n}{
       <-> ssub * Alegreya-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{sc}{
+      <-> ssub * Alegreya-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{scsl}{
+      <-> ssub * Alegreya-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TLF}{bx}{sl}{
+      <-> ssub * Alegreya-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-TLF}{bx}{it}{
       <-> ssub * Alegreya-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TOsF.fd
index 3773b82f0cf..d77bef544d0 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1Alegreya-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1Alegreya-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/Alegreya-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/Alegreya-TOsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{LY1}{Alegreya-TOsF}{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{scsl}{
-      <-> ssub * Alegreya-TOsF/eb/scit
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{sl}{
-      <-> ssub * Alegreya-TOsF/eb/it
+\DeclareFontShape{LY1}{Alegreya-TOsF}{regular}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tosf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{n}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{it}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{scsl}{
-      <-> ssub * Alegreya-TOsF/k/scit
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{k}{sl}{
-      <-> ssub * Alegreya-TOsF/k/it
+\DeclareFontShape{LY1}{Alegreya-TOsF}{black}{sl}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tosf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{n}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{it}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scit
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{sl}{
-      <-> ssub * Alegreya-TOsF/b/it
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bold}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tosf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{n}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{medium}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{scsl}{
-      <-> ssub * Alegreya-TOsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{mb}{sl}{
-      <-> ssub * Alegreya-TOsF/mb/it
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-ly1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{m}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{m}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TOsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-sc-ly1
+      <-> ssub * Alegreya-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TOsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-ly1
+      <-> ssub * Alegreya-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TOsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-ly1
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TOsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-sc-ly1
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{m}{scsl}{
-      <-> ssub * Alegreya-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{m}{sl}{
-      <-> ssub * Alegreya-TOsF/m/it
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{sl}{
-      <-> ssub * Alegreya-TOsF/b/sl
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{sc}{
+      <-> ssub * Alegreya-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scsl
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{n}{
+      <-> ssub * Alegreya-TOsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{sc}{
-      <-> ssub * Alegreya-TOsF/b/sc
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{it}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{sb}{scit}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{sc}{
+      <-> ssub * Alegreya-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{n}{
+      <-> ssub * Alegreya-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{it}{
+      <-> ssub * Alegreya-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{b}{scit}{
+      <-> ssub * Alegreya-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{sc}{
+      <-> ssub * Alegreya-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{n}{
+      <-> ssub * Alegreya-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{it}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{eb}{scit}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{sl}{
+      <-> ssub * Alegreya-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{sc}{
+      <-> ssub * Alegreya-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{n}{
+      <-> ssub * Alegreya-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{it}{
+      <-> ssub * Alegreya-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{ub}{scit}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{n}{
       <-> ssub * Alegreya-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{sc}{
+      <-> ssub * Alegreya-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{scsl}{
+      <-> ssub * Alegreya-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{sl}{
+      <-> ssub * Alegreya-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{Alegreya-TOsF}{bx}{it}{
       <-> ssub * Alegreya-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Inf.fd
index 2537ae1a8f1..e5bbe2b8415 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-Inf.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-Inf}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{sl}{
-      <-> ssub * AlegreyaSans-Inf/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{k}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{k}{sl}{
-      <-> ssub * AlegreyaSans-Inf/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-inf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{black}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{light}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-inf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{sc}{
+      <-> ssub * AlegreyaSans-Inf/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{n}{
+      <-> ssub * AlegreyaSans-Inf/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{it}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{el}{scit}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{sc}{
+      <-> ssub * AlegreyaSans-Inf/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{n}{
+      <-> ssub * AlegreyaSans-Inf/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{it}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{l}{scit}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{sc}{
+      <-> ssub * AlegreyaSans-Inf/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-ly1
+      <-> ssub * AlegreyaSans-Inf/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-ly1
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{sl}{
-      <-> ssub * AlegreyaSans-Inf/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{m}{scit}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-ly1
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{i}{sl}{
-      <-> ssub * AlegreyaSans-Inf/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{n}{
+      <-> ssub * AlegreyaSans-Inf/medium/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{it}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{sc}{
+      <-> ssub * AlegreyaSans-Inf/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{n}{
+      <-> ssub * AlegreyaSans-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{it}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{b}{scit}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{n}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{it}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Inf/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{n}{
+      <-> ssub * AlegreyaSans-Inf/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{it}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{n}{
       <-> ssub * AlegreyaSans-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Inf/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Inf/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{it}{
       <-> ssub * AlegreyaSans-Inf/b/it
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-Inf}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-LF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-LF.fd
index e4eedc1893f..3d22f2261a6 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-LF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-LF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-LF}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-LF/l/scit
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{sl}{
-      <-> ssub * AlegreyaSans-LF/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/eb/scit
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-LF/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{black}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-LF/k/scit
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{k}{sl}{
-      <-> ssub * AlegreyaSans-LF/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scit
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{light}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{sc}{
+      <-> ssub * AlegreyaSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{n}{
+      <-> ssub * AlegreyaSans-LF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{it}{
+      <-> ssub * AlegreyaSans-LF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{el}{scit}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{sc}{
+      <-> ssub * AlegreyaSans-LF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{n}{
+      <-> ssub * AlegreyaSans-LF/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{it}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{l}{scit}{
+      <-> ssub * AlegreyaSans-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-LF/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-ly1
+      <-> ssub * AlegreyaSans-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ly1
+      <-> ssub * AlegreyaSans-LF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ly1
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-ly1
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{m}{sl}{
-      <-> ssub * AlegreyaSans-LF/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-LF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{n}{
+      <-> ssub * AlegreyaSans-LF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{it}{
+      <-> ssub * AlegreyaSans-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-LF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{i}{sl}{
-      <-> ssub * AlegreyaSans-LF/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{sc}{
+      <-> ssub * AlegreyaSans-LF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scsl
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{n}{
+      <-> ssub * AlegreyaSans-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-LF/b/sc
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{it}{
+      <-> ssub * AlegreyaSans-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{b}{scit}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{n}{
+      <-> ssub * AlegreyaSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{it}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-LF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{n}{
+      <-> ssub * AlegreyaSans-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{it}{
+      <-> ssub * AlegreyaSans-LF/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{n}{
       <-> ssub * AlegreyaSans-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-LF}{bx}{it}{
       <-> ssub * AlegreyaSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-OsF.fd
index 8dde9e3d965..788eea35f2a 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-OsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-OsF}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/l/scit
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-OsF/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/eb/scit
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/k/scit
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-OsF/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scit
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{n}{
+      <-> ssub * AlegreyaSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{it}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{n}{
+      <-> ssub * AlegreyaSans-OsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{it}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-ly1
+      <-> ssub * AlegreyaSans-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ly1
+      <-> ssub * AlegreyaSans-OsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ly1
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-ly1
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-OsF/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-OsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-OsF/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-OsF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scsl
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{n}{
+      <-> ssub * AlegreyaSans-OsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-OsF/b/sc
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{it}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{n}{
       <-> ssub * AlegreyaSans-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-OsF}{bx}{it}{
       <-> ssub * AlegreyaSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Sup.fd
index 6fefb57597d..89a2d4b8c3a 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-Sup.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-Sup}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{sl}{
-      <-> ssub * AlegreyaSans-Sup/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{k}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{k}{sl}{
-      <-> ssub * AlegreyaSans-Sup/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-sup-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{black}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{light}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-sup-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{sc}{
+      <-> ssub * AlegreyaSans-Sup/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{n}{
+      <-> ssub * AlegreyaSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{it}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{el}{scit}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{sc}{
+      <-> ssub * AlegreyaSans-Sup/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{n}{
+      <-> ssub * AlegreyaSans-Sup/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{it}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{l}{scit}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{sc}{
+      <-> ssub * AlegreyaSans-Sup/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-ly1
+      <-> ssub * AlegreyaSans-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-ly1
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{sl}{
-      <-> ssub * AlegreyaSans-Sup/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{m}{scit}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-ly1
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{i}{sl}{
-      <-> ssub * AlegreyaSans-Sup/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{n}{
+      <-> ssub * AlegreyaSans-Sup/medium/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{it}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{sc}{
+      <-> ssub * AlegreyaSans-Sup/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{n}{
+      <-> ssub * AlegreyaSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{it}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{b}{scit}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{n}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{it}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Sup/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{n}{
+      <-> ssub * AlegreyaSans-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{it}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{n}{
       <-> ssub * AlegreyaSans-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Sup/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{it}{
       <-> ssub * AlegreyaSans-Sup/b/it
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-Sup}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TLF.fd
index 3275500b807..a0e77893c0b 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-TLF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-TLF}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/l/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TLF/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/eb/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/k/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TLF/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{n}{
+      <-> ssub * AlegreyaSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{it}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{n}{
+      <-> ssub * AlegreyaSans-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{it}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-ly1
+      <-> ssub * AlegreyaSans-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ly1
+      <-> ssub * AlegreyaSans-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ly1
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-ly1
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TLF/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TLF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TLF/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TLF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scsl
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{n}{
+      <-> ssub * AlegreyaSans-TLF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TLF/b/sc
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{it}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{n}{
       <-> ssub * AlegreyaSans-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-TLF}{bx}{it}{
       <-> ssub * AlegreyaSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TOsF.fd
index cca1dde426d..6c029d1011d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/LY1AlegreyaSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{LY1AlegreyaSans-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for LY1/AlegreyaSans-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for LY1/AlegreyaSans-TOsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{LY1}{AlegreyaSans-TOsF}{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/l/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/l/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/k/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/k/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scit
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{n}{
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{it}{
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-ly1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{n}{
+      <-> ssub * AlegreyaSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{it}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{n}{
+      <-> ssub * AlegreyaSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{it}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-ly1
+      <-> ssub * AlegreyaSans-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ly1
+      <-> ssub * AlegreyaSans-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ly1
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-ly1
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/m/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/medium/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/i/it
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/sl
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scsl
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{n}{
+      <-> ssub * AlegreyaSans-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TOsF/b/sc
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{it}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{n}{
       <-> ssub * AlegreyaSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{AlegreyaSans-TOsF}{bx}{it}{
       <-> ssub * AlegreyaSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Inf.fd
index 409881f9d81..ba03ad54fe2 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-Inf.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{OT1}{Alegreya-Inf}{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{sl}{
-      <-> ssub * Alegreya-Inf/eb/it
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{regular}{sl}{
+      <-> ssub * Alegreya-Inf/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{k}{sl}{
-      <-> ssub * Alegreya-Inf/k/it
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{black}{sl}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{b}{sl}{
-      <-> ssub * Alegreya-Inf/b/it
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bold}{sl}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{mb}{sl}{
-      <-> ssub * Alegreya-Inf/mb/it
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{medium}{sl}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{extrabold}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{m}{sl}{
+      <-> ssub * Alegreya-Inf/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{m}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{m}{sc}{
+      <-> ssub * Alegreya-Inf/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Inf}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-inf-ot1
+      <-> ssub * Alegreya-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Inf}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-inf-ot1
+      <-> ssub * Alegreya-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{m}{sl}{
-      <-> ssub * Alegreya-Inf/m/it
+\DeclareFontShape{OT1}{Alegreya-Inf}{m}{scit}{
+      <-> ssub * Alegreya-Inf/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Inf}{bx}{sl}{
-      <-> ssub * Alegreya-Inf/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{sl}{
+      <-> ssub * Alegreya-Inf/medium/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{sc}{
+      <-> ssub * Alegreya-Inf/medium/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{n}{
+      <-> ssub * Alegreya-Inf/medium/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{it}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{sb}{scit}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{sl}{
+      <-> ssub * Alegreya-Inf/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{sc}{
+      <-> ssub * Alegreya-Inf/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{n}{
+      <-> ssub * Alegreya-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{it}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{b}{scit}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{sc}{
+      <-> ssub * Alegreya-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{n}{
+      <-> ssub * Alegreya-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{it}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{eb}{scit}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{sl}{
+      <-> ssub * Alegreya-Inf/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{sc}{
+      <-> ssub * Alegreya-Inf/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{n}{
+      <-> ssub * Alegreya-Inf/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{it}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{ub}{scit}{
+      <-> ssub * Alegreya-Inf/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Inf}{bx}{n}{
       <-> ssub * Alegreya-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-Inf}{bx}{sc}{
+      <-> ssub * Alegreya-Inf/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bx}{scsl}{
+      <-> ssub * Alegreya-Inf/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Inf}{bx}{sl}{
+      <-> ssub * Alegreya-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-Inf}{bx}{it}{
       <-> ssub * Alegreya-Inf/b/it
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-Inf}{bx}{scit}{
+      <-> ssub * Alegreya-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-LF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-LF.fd
index 88d7d70c317..66c59b5bff1 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-LF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-LF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{OT1}{Alegreya-LF}{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{scsl}{
-      <-> ssub * Alegreya-LF/eb/scit
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{eb}{sl}{
-      <-> ssub * Alegreya-LF/eb/it
+\DeclareFontShape{OT1}{Alegreya-LF}{regular}{sl}{
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-lf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{scsl}{
-      <-> ssub * Alegreya-LF/k/scit
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{scsl}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{k}{sl}{
-      <-> ssub * Alegreya-LF/k/it
+\DeclareFontShape{OT1}{Alegreya-LF}{black}{sl}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-lf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{scsl}{
-      <-> ssub * Alegreya-LF/b/scit
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{b}{sl}{
-      <-> ssub * Alegreya-LF/b/it
+\DeclareFontShape{OT1}{Alegreya-LF}{bold}{sl}{
+      <-> ssub * Alegreya-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-lf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{medium}{sl}{
+      <-> ssub * Alegreya-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{scsl}{
-      <-> ssub * Alegreya-LF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{mb}{sl}{
-      <-> ssub * Alegreya-LF/mb/it
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{extrabold}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-LF}{m}{sl}{
+      <-> ssub * Alegreya-LF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{m}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-LF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-sc-ot1
+      <-> ssub * Alegreya-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-LF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-ot1
+      <-> ssub * Alegreya-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-LF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-ot1
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-LF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-sc-ot1
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{m}{scsl}{
-      <-> ssub * Alegreya-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{sl}{
+      <-> ssub * Alegreya-LF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{m}{sl}{
-      <-> ssub * Alegreya-LF/m/it
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{bx}{sl}{
-      <-> ssub * Alegreya-LF/b/sl
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{sc}{
+      <-> ssub * Alegreya-LF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{bx}{scsl}{
-      <-> ssub * Alegreya-LF/b/scsl
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{n}{
+      <-> ssub * Alegreya-LF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-LF}{bx}{sc}{
-      <-> ssub * Alegreya-LF/b/sc
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{it}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{sb}{scit}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{sl}{
+      <-> ssub * Alegreya-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{sc}{
+      <-> ssub * Alegreya-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{n}{
+      <-> ssub * Alegreya-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{it}{
+      <-> ssub * Alegreya-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{b}{scit}{
+      <-> ssub * Alegreya-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{sc}{
+      <-> ssub * Alegreya-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{n}{
+      <-> ssub * Alegreya-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{it}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{eb}{scit}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{sl}{
+      <-> ssub * Alegreya-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{scsl}{
+      <-> ssub * Alegreya-LF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{sc}{
+      <-> ssub * Alegreya-LF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{n}{
+      <-> ssub * Alegreya-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{it}{
+      <-> ssub * Alegreya-LF/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{ub}{scit}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-LF}{bx}{n}{
       <-> ssub * Alegreya-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-LF}{bx}{sc}{
+      <-> ssub * Alegreya-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{bx}{scsl}{
+      <-> ssub * Alegreya-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-LF}{bx}{sl}{
+      <-> ssub * Alegreya-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-LF}{bx}{it}{
       <-> ssub * Alegreya-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-OsF.fd
index 17453415324..4c916611db7 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-OsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{OT1}{Alegreya-OsF}{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{scsl}{
-      <-> ssub * Alegreya-OsF/eb/scit
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{sl}{
-      <-> ssub * Alegreya-OsF/eb/it
+\DeclareFontShape{OT1}{Alegreya-OsF}{regular}{sl}{
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-osf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{scsl}{
-      <-> ssub * Alegreya-OsF/k/scit
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{k}{sl}{
-      <-> ssub * Alegreya-OsF/k/it
+\DeclareFontShape{OT1}{Alegreya-OsF}{black}{sl}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-osf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scit
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{b}{sl}{
-      <-> ssub * Alegreya-OsF/b/it
+\DeclareFontShape{OT1}{Alegreya-OsF}{bold}{sl}{
+      <-> ssub * Alegreya-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-osf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{medium}{sl}{
+      <-> ssub * Alegreya-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{scsl}{
-      <-> ssub * Alegreya-OsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{mb}{sl}{
-      <-> ssub * Alegreya-OsF/mb/it
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{m}{sl}{
+      <-> ssub * Alegreya-OsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{m}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-OsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-sc-ot1
+      <-> ssub * Alegreya-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-OsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-ot1
+      <-> ssub * Alegreya-OsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-OsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-ot1
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-OsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-sc-ot1
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{m}{scsl}{
-      <-> ssub * Alegreya-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{sl}{
+      <-> ssub * Alegreya-OsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{m}{sl}{
-      <-> ssub * Alegreya-OsF/m/it
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{sl}{
-      <-> ssub * Alegreya-OsF/b/sl
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{sc}{
+      <-> ssub * Alegreya-OsF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scsl
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{n}{
+      <-> ssub * Alegreya-OsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{sc}{
-      <-> ssub * Alegreya-OsF/b/sc
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{it}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{sb}{scit}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{sl}{
+      <-> ssub * Alegreya-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{sc}{
+      <-> ssub * Alegreya-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{n}{
+      <-> ssub * Alegreya-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{it}{
+      <-> ssub * Alegreya-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{b}{scit}{
+      <-> ssub * Alegreya-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{sc}{
+      <-> ssub * Alegreya-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{n}{
+      <-> ssub * Alegreya-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{it}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{eb}{scit}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{sl}{
+      <-> ssub * Alegreya-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{sc}{
+      <-> ssub * Alegreya-OsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{n}{
+      <-> ssub * Alegreya-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{it}{
+      <-> ssub * Alegreya-OsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{ub}{scit}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-OsF}{bx}{n}{
       <-> ssub * Alegreya-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{sc}{
+      <-> ssub * Alegreya-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{scsl}{
+      <-> ssub * Alegreya-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-OsF}{bx}{sl}{
+      <-> ssub * Alegreya-OsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-OsF}{bx}{it}{
       <-> ssub * Alegreya-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Sup.fd
index b88f5a98cb4..fdaa7b3738d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-Sup.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{OT1}{Alegreya-Sup}{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{sl}{
-      <-> ssub * Alegreya-Sup/eb/it
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{regular}{sl}{
+      <-> ssub * Alegreya-Sup/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{k}{sl}{
-      <-> ssub * Alegreya-Sup/k/it
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{black}{sl}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{b}{sl}{
-      <-> ssub * Alegreya-Sup/b/it
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bold}{sl}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{mb}{sl}{
-      <-> ssub * Alegreya-Sup/mb/it
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{medium}{sl}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{extrabold}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{m}{sl}{
+      <-> ssub * Alegreya-Sup/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{m}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{m}{sc}{
+      <-> ssub * Alegreya-Sup/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Sup}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-sup-ot1
+      <-> ssub * Alegreya-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Sup}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-sup-ot1
+      <-> ssub * Alegreya-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{m}{sl}{
-      <-> ssub * Alegreya-Sup/m/it
+\DeclareFontShape{OT1}{Alegreya-Sup}{m}{scit}{
+      <-> ssub * Alegreya-Sup/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-Sup}{bx}{sl}{
-      <-> ssub * Alegreya-Sup/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{sl}{
+      <-> ssub * Alegreya-Sup/medium/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{sc}{
+      <-> ssub * Alegreya-Sup/medium/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{n}{
+      <-> ssub * Alegreya-Sup/medium/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{it}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{sb}{scit}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{sl}{
+      <-> ssub * Alegreya-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{sc}{
+      <-> ssub * Alegreya-Sup/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{n}{
+      <-> ssub * Alegreya-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{it}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{b}{scit}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{sc}{
+      <-> ssub * Alegreya-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{n}{
+      <-> ssub * Alegreya-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{it}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{eb}{scit}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{sl}{
+      <-> ssub * Alegreya-Sup/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{sc}{
+      <-> ssub * Alegreya-Sup/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{n}{
+      <-> ssub * Alegreya-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{it}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{ub}{scit}{
+      <-> ssub * Alegreya-Sup/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-Sup}{bx}{n}{
       <-> ssub * Alegreya-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-Sup}{bx}{sc}{
+      <-> ssub * Alegreya-Sup/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bx}{scsl}{
+      <-> ssub * Alegreya-Sup/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-Sup}{bx}{sl}{
+      <-> ssub * Alegreya-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-Sup}{bx}{it}{
       <-> ssub * Alegreya-Sup/b/it
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-Sup}{bx}{scit}{
+      <-> ssub * Alegreya-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TLF.fd
index c4a7b9f4cc5..f11e2fd6e9a 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-TLF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{OT1}{Alegreya-TLF}{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{scsl}{
-      <-> ssub * Alegreya-TLF/eb/scit
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{sl}{
-      <-> ssub * Alegreya-TLF/eb/it
+\DeclareFontShape{OT1}{Alegreya-TLF}{regular}{sl}{
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tlf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{scsl}{
-      <-> ssub * Alegreya-TLF/k/scit
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{k}{sl}{
-      <-> ssub * Alegreya-TLF/k/it
+\DeclareFontShape{OT1}{Alegreya-TLF}{black}{sl}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tlf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scit
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{b}{sl}{
-      <-> ssub * Alegreya-TLF/b/it
+\DeclareFontShape{OT1}{Alegreya-TLF}{bold}{sl}{
+      <-> ssub * Alegreya-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tlf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{medium}{sl}{
+      <-> ssub * Alegreya-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{scsl}{
-      <-> ssub * Alegreya-TLF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{mb}{sl}{
-      <-> ssub * Alegreya-TLF/mb/it
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{m}{sl}{
+      <-> ssub * Alegreya-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{m}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TLF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-sc-ot1
+      <-> ssub * Alegreya-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TLF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-ot1
+      <-> ssub * Alegreya-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TLF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-ot1
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TLF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-sc-ot1
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{m}{scsl}{
-      <-> ssub * Alegreya-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{sl}{
+      <-> ssub * Alegreya-TLF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{m}{sl}{
-      <-> ssub * Alegreya-TLF/m/it
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{sl}{
-      <-> ssub * Alegreya-TLF/b/sl
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{sc}{
+      <-> ssub * Alegreya-TLF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scsl
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{n}{
+      <-> ssub * Alegreya-TLF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{sc}{
-      <-> ssub * Alegreya-TLF/b/sc
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{it}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{sb}{scit}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{sl}{
+      <-> ssub * Alegreya-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{sc}{
+      <-> ssub * Alegreya-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{n}{
+      <-> ssub * Alegreya-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{it}{
+      <-> ssub * Alegreya-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{b}{scit}{
+      <-> ssub * Alegreya-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{sc}{
+      <-> ssub * Alegreya-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{n}{
+      <-> ssub * Alegreya-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{it}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{eb}{scit}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{sl}{
+      <-> ssub * Alegreya-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{sc}{
+      <-> ssub * Alegreya-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{n}{
+      <-> ssub * Alegreya-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{it}{
+      <-> ssub * Alegreya-TLF/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{ub}{scit}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TLF}{bx}{n}{
       <-> ssub * Alegreya-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{sc}{
+      <-> ssub * Alegreya-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{scsl}{
+      <-> ssub * Alegreya-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TLF}{bx}{sl}{
+      <-> ssub * Alegreya-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-TLF}{bx}{it}{
       <-> ssub * Alegreya-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TOsF.fd
index a14e5ac02fc..0471b244692 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1Alegreya-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1Alegreya-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/Alegreya-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/Alegreya-TOsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{OT1}{Alegreya-TOsF}{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{scsl}{
-      <-> ssub * Alegreya-TOsF/eb/scit
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{sl}{
-      <-> ssub * Alegreya-TOsF/eb/it
+\DeclareFontShape{OT1}{Alegreya-TOsF}{regular}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tosf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{n}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{it}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{scsl}{
-      <-> ssub * Alegreya-TOsF/k/scit
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{k}{sl}{
-      <-> ssub * Alegreya-TOsF/k/it
+\DeclareFontShape{OT1}{Alegreya-TOsF}{black}{sl}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tosf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{n}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{it}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scit
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{sl}{
-      <-> ssub * Alegreya-TOsF/b/it
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bold}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tosf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{n}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{medium}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{scsl}{
-      <-> ssub * Alegreya-TOsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{mb}{sl}{
-      <-> ssub * Alegreya-TOsF/mb/it
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-ot1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{m}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{m}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TOsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-sc-ot1
+      <-> ssub * Alegreya-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TOsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-ot1
+      <-> ssub * Alegreya-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TOsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-ot1
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TOsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-sc-ot1
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{m}{scsl}{
-      <-> ssub * Alegreya-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{m}{sl}{
-      <-> ssub * Alegreya-TOsF/m/it
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{sl}{
-      <-> ssub * Alegreya-TOsF/b/sl
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{sc}{
+      <-> ssub * Alegreya-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scsl
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{n}{
+      <-> ssub * Alegreya-TOsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{sc}{
-      <-> ssub * Alegreya-TOsF/b/sc
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{it}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{sb}{scit}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{sc}{
+      <-> ssub * Alegreya-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{n}{
+      <-> ssub * Alegreya-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{it}{
+      <-> ssub * Alegreya-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{b}{scit}{
+      <-> ssub * Alegreya-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{sc}{
+      <-> ssub * Alegreya-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{n}{
+      <-> ssub * Alegreya-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{it}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{eb}{scit}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{sl}{
+      <-> ssub * Alegreya-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{sc}{
+      <-> ssub * Alegreya-TOsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{n}{
+      <-> ssub * Alegreya-TOsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{it}{
+      <-> ssub * Alegreya-TOsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{ub}{scit}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{n}{
       <-> ssub * Alegreya-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{sc}{
+      <-> ssub * Alegreya-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{scsl}{
+      <-> ssub * Alegreya-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{sl}{
+      <-> ssub * Alegreya-TOsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{Alegreya-TOsF}{bx}{it}{
       <-> ssub * Alegreya-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Inf.fd
index b42defcce29..4a6db302cde 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-Inf.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-Inf}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{sl}{
-      <-> ssub * AlegreyaSans-Inf/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{k}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{k}{sl}{
-      <-> ssub * AlegreyaSans-Inf/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-inf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{black}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{light}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-inf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{sc}{
+      <-> ssub * AlegreyaSans-Inf/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{n}{
+      <-> ssub * AlegreyaSans-Inf/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{it}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{el}{scit}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{sc}{
+      <-> ssub * AlegreyaSans-Inf/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{n}{
+      <-> ssub * AlegreyaSans-Inf/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{it}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{l}{scit}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{sc}{
+      <-> ssub * AlegreyaSans-Inf/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-ot1
+      <-> ssub * AlegreyaSans-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-ot1
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{sl}{
-      <-> ssub * AlegreyaSans-Inf/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{m}{scit}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-ot1
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{i}{sl}{
-      <-> ssub * AlegreyaSans-Inf/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{n}{
+      <-> ssub * AlegreyaSans-Inf/medium/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{it}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{sc}{
+      <-> ssub * AlegreyaSans-Inf/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{n}{
+      <-> ssub * AlegreyaSans-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{it}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{b}{scit}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{n}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{it}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Inf/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{n}{
+      <-> ssub * AlegreyaSans-Inf/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{it}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{n}{
       <-> ssub * AlegreyaSans-Inf/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Inf/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Inf/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{it}{
       <-> ssub * AlegreyaSans-Inf/b/it
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-Inf}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-LF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-LF.fd
index f665094c292..5355f0c3d45 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-LF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-LF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-LF}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-LF/l/scit
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{sl}{
-      <-> ssub * AlegreyaSans-LF/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/eb/scit
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-LF/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{black}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-LF/k/scit
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{k}{sl}{
-      <-> ssub * AlegreyaSans-LF/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scit
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{light}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{sc}{
+      <-> ssub * AlegreyaSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{n}{
+      <-> ssub * AlegreyaSans-LF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{it}{
+      <-> ssub * AlegreyaSans-LF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{el}{scit}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{sc}{
+      <-> ssub * AlegreyaSans-LF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{n}{
+      <-> ssub * AlegreyaSans-LF/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{it}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{l}{scit}{
+      <-> ssub * AlegreyaSans-LF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-LF/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-ot1
+      <-> ssub * AlegreyaSans-LF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ot1
+      <-> ssub * AlegreyaSans-LF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ot1
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-ot1
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{m}{sl}{
-      <-> ssub * AlegreyaSans-LF/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-LF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{n}{
+      <-> ssub * AlegreyaSans-LF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{it}{
+      <-> ssub * AlegreyaSans-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-LF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{i}{sl}{
-      <-> ssub * AlegreyaSans-LF/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{sc}{
+      <-> ssub * AlegreyaSans-LF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scsl
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{n}{
+      <-> ssub * AlegreyaSans-LF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-LF/b/sc
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{it}{
+      <-> ssub * AlegreyaSans-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{b}{scit}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{n}{
+      <-> ssub * AlegreyaSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{it}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-LF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{n}{
+      <-> ssub * AlegreyaSans-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{it}{
+      <-> ssub * AlegreyaSans-LF/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{n}{
       <-> ssub * AlegreyaSans-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-LF}{bx}{it}{
       <-> ssub * AlegreyaSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-OsF.fd
index 43e76ba42dd..033cc3fed6d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-OsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-OsF}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/l/scit
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-OsF/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/eb/scit
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/k/scit
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-OsF/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scit
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{n}{
+      <-> ssub * AlegreyaSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{it}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{n}{
+      <-> ssub * AlegreyaSans-OsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{it}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-ot1
+      <-> ssub * AlegreyaSans-OsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ot1
+      <-> ssub * AlegreyaSans-OsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ot1
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-ot1
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-OsF/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-OsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-OsF/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-OsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scsl
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{n}{
+      <-> ssub * AlegreyaSans-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-OsF/b/sc
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{it}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-OsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{n}{
       <-> ssub * AlegreyaSans-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-OsF}{bx}{it}{
       <-> ssub * AlegreyaSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Sup.fd
index 31ff428f657..2a083d975ef 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-Sup.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-Sup}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{sl}{
-      <-> ssub * AlegreyaSans-Sup/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{k}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{k}{sl}{
-      <-> ssub * AlegreyaSans-Sup/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-sup-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{black}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{light}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-sup-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{sc}{
+      <-> ssub * AlegreyaSans-Sup/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{n}{
+      <-> ssub * AlegreyaSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{it}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{el}{scit}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{sc}{
+      <-> ssub * AlegreyaSans-Sup/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{n}{
+      <-> ssub * AlegreyaSans-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{it}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{l}{scit}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{sc}{
+      <-> ssub * AlegreyaSans-Sup/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-ot1
+      <-> ssub * AlegreyaSans-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-ot1
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{sl}{
-      <-> ssub * AlegreyaSans-Sup/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{m}{scit}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-ot1
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{i}{sl}{
-      <-> ssub * AlegreyaSans-Sup/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{n}{
+      <-> ssub * AlegreyaSans-Sup/medium/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{it}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{sc}{
+      <-> ssub * AlegreyaSans-Sup/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{n}{
+      <-> ssub * AlegreyaSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{it}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{b}{scit}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{n}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{it}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Sup/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{n}{
+      <-> ssub * AlegreyaSans-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{it}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{n}{
       <-> ssub * AlegreyaSans-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Sup/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{it}{
       <-> ssub * AlegreyaSans-Sup/b/it
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-Sup}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TLF.fd
index fef59753152..b25a46e6627 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-TLF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-TLF}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/l/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TLF/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/eb/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/k/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TLF/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{n}{
+      <-> ssub * AlegreyaSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{it}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{n}{
+      <-> ssub * AlegreyaSans-TLF/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{it}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-ot1
+      <-> ssub * AlegreyaSans-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ot1
+      <-> ssub * AlegreyaSans-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ot1
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-ot1
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TLF/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TLF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TLF/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TLF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scsl
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{n}{
+      <-> ssub * AlegreyaSans-TLF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TLF/b/sc
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{it}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TLF/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{n}{
       <-> ssub * AlegreyaSans-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-TLF}{bx}{it}{
       <-> ssub * AlegreyaSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TOsF.fd
index 8b1cab1907e..859f8051aaf 100644
--- a/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/OT1AlegreyaSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{OT1AlegreyaSans-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for OT1/AlegreyaSans-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for OT1/AlegreyaSans-TOsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{OT1}{AlegreyaSans-TOsF}{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/l/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/l/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-ot1
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/k/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/k/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scit
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{n}{
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{it}{
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-ot1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{n}{
+      <-> ssub * AlegreyaSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{it}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{n}{
+      <-> ssub * AlegreyaSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{it}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-ot1
+      <-> ssub * AlegreyaSans-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ot1
+      <-> ssub * AlegreyaSans-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ot1
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-ot1
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/m/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/medium/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/i/it
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/sl
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scsl
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{n}{
+      <-> ssub * AlegreyaSans-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TOsF/b/sc
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{it}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{n}{
       <-> ssub * AlegreyaSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{AlegreyaSans-TOsF}{bx}{it}{
       <-> ssub * AlegreyaSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Inf.fd
index 550826aefe9..1ca0345c3f4 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-Inf.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{T1}{Alegreya-Inf}{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{eb}{sl}{
-      <-> ssub * Alegreya-Inf/eb/it
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{regular}{sl}{
+      <-> ssub * Alegreya-Inf/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{k}{sl}{
-      <-> ssub * Alegreya-Inf/k/it
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{black}{sl}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{b}{sl}{
-      <-> ssub * Alegreya-Inf/b/it
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bold}{sl}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{mb}{sl}{
-      <-> ssub * Alegreya-Inf/mb/it
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{medium}{sl}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{extrabold}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-Inf}{m}{sl}{
+      <-> ssub * Alegreya-Inf/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{m}{scsl}{
+      <-> ssub * Alegreya-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{m}{sc}{
+      <-> ssub * Alegreya-Inf/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Inf}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-inf-t1
+      <-> ssub * Alegreya-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Inf}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-inf-t1
+      <-> ssub * Alegreya-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{m}{sl}{
-      <-> ssub * Alegreya-Inf/m/it
+\DeclareFontShape{T1}{Alegreya-Inf}{m}{scit}{
+      <-> ssub * Alegreya-Inf/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Inf}{bx}{sl}{
-      <-> ssub * Alegreya-Inf/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{sl}{
+      <-> ssub * Alegreya-Inf/medium/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{scsl}{
+      <-> ssub * Alegreya-Inf/medium/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{sc}{
+      <-> ssub * Alegreya-Inf/medium/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{n}{
+      <-> ssub * Alegreya-Inf/medium/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{it}{
+      <-> ssub * Alegreya-Inf/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{sb}{scit}{
+      <-> ssub * Alegreya-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{sl}{
+      <-> ssub * Alegreya-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{scsl}{
+      <-> ssub * Alegreya-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{sc}{
+      <-> ssub * Alegreya-Inf/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{n}{
+      <-> ssub * Alegreya-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{it}{
+      <-> ssub * Alegreya-Inf/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{b}{scit}{
+      <-> ssub * Alegreya-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{sl}{
+      <-> ssub * Alegreya-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{scsl}{
+      <-> ssub * Alegreya-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{sc}{
+      <-> ssub * Alegreya-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{n}{
+      <-> ssub * Alegreya-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{it}{
+      <-> ssub * Alegreya-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{eb}{scit}{
+      <-> ssub * Alegreya-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{sl}{
+      <-> ssub * Alegreya-Inf/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{scsl}{
+      <-> ssub * Alegreya-Inf/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{sc}{
+      <-> ssub * Alegreya-Inf/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{n}{
+      <-> ssub * Alegreya-Inf/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{it}{
+      <-> ssub * Alegreya-Inf/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{ub}{scit}{
+      <-> ssub * Alegreya-Inf/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Inf}{bx}{n}{
       <-> ssub * Alegreya-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-Inf}{bx}{sc}{
+      <-> ssub * Alegreya-Inf/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bx}{scsl}{
+      <-> ssub * Alegreya-Inf/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Inf}{bx}{sl}{
+      <-> ssub * Alegreya-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-Inf}{bx}{it}{
       <-> ssub * Alegreya-Inf/b/it
 }{}
 
+\DeclareFontShape{T1}{Alegreya-Inf}{bx}{scit}{
+      <-> ssub * Alegreya-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-LF.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-LF.fd
index 25d70aaf4a8..d73c37034c9 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-LF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-LF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{T1}{Alegreya-LF}{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-t1
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{scsl}{
-      <-> ssub * Alegreya-LF/eb/scit
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{eb}{sl}{
-      <-> ssub * Alegreya-LF/eb/it
+\DeclareFontShape{T1}{Alegreya-LF}{regular}{sl}{
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-lf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-LF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-LF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-LF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-t1
+\DeclareFontShape{T1}{Alegreya-LF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{scsl}{
-      <-> ssub * Alegreya-LF/k/scit
+\DeclareFontShape{T1}{Alegreya-LF}{black}{scsl}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{k}{sl}{
-      <-> ssub * Alegreya-LF/k/it
+\DeclareFontShape{T1}{Alegreya-LF}{black}{sl}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-lf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{scsl}{
-      <-> ssub * Alegreya-LF/b/scit
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{b}{sl}{
-      <-> ssub * Alegreya-LF/b/it
+\DeclareFontShape{T1}{Alegreya-LF}{bold}{sl}{
+      <-> ssub * Alegreya-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-lf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{medium}{sl}{
+      <-> ssub * Alegreya-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{scsl}{
-      <-> ssub * Alegreya-LF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{mb}{sl}{
-      <-> ssub * Alegreya-LF/mb/it
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{extrabold}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-LF}{m}{sl}{
+      <-> ssub * Alegreya-LF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{m}{scsl}{
+      <-> ssub * Alegreya-LF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Alegreya-LF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-sc-t1
+      <-> ssub * Alegreya-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-LF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-t1
+      <-> ssub * Alegreya-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-LF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-t1
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Alegreya-LF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-sc-t1
+      <-> ssub * Alegreya-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{m}{scsl}{
-      <-> ssub * Alegreya-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{sl}{
+      <-> ssub * Alegreya-LF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{m}{sl}{
-      <-> ssub * Alegreya-LF/m/it
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{scsl}{
+      <-> ssub * Alegreya-LF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{bx}{sl}{
-      <-> ssub * Alegreya-LF/b/sl
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{sc}{
+      <-> ssub * Alegreya-LF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{bx}{scsl}{
-      <-> ssub * Alegreya-LF/b/scsl
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{n}{
+      <-> ssub * Alegreya-LF/medium/n
 }{}
 
-\DeclareFontShape{T1}{Alegreya-LF}{bx}{sc}{
-      <-> ssub * Alegreya-LF/b/sc
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{it}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{sb}{scit}{
+      <-> ssub * Alegreya-LF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{sl}{
+      <-> ssub * Alegreya-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{scsl}{
+      <-> ssub * Alegreya-LF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{sc}{
+      <-> ssub * Alegreya-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{n}{
+      <-> ssub * Alegreya-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{it}{
+      <-> ssub * Alegreya-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{b}{scit}{
+      <-> ssub * Alegreya-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{scsl}{
+      <-> ssub * Alegreya-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{sc}{
+      <-> ssub * Alegreya-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{n}{
+      <-> ssub * Alegreya-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{it}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{eb}{scit}{
+      <-> ssub * Alegreya-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{sl}{
+      <-> ssub * Alegreya-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{scsl}{
+      <-> ssub * Alegreya-LF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{sc}{
+      <-> ssub * Alegreya-LF/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{n}{
+      <-> ssub * Alegreya-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{it}{
+      <-> ssub * Alegreya-LF/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{ub}{scit}{
+      <-> ssub * Alegreya-LF/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-LF}{bx}{n}{
       <-> ssub * Alegreya-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-LF}{bx}{sc}{
+      <-> ssub * Alegreya-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{bx}{scsl}{
+      <-> ssub * Alegreya-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-LF}{bx}{sl}{
+      <-> ssub * Alegreya-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-LF}{bx}{it}{
       <-> ssub * Alegreya-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-OsF.fd
index a78b08e016c..ed7f1202974 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-OsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{T1}{Alegreya-OsF}{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{scsl}{
-      <-> ssub * Alegreya-OsF/eb/scit
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{eb}{sl}{
-      <-> ssub * Alegreya-OsF/eb/it
+\DeclareFontShape{T1}{Alegreya-OsF}{regular}{sl}{
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-osf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{scsl}{
-      <-> ssub * Alegreya-OsF/k/scit
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{k}{sl}{
-      <-> ssub * Alegreya-OsF/k/it
+\DeclareFontShape{T1}{Alegreya-OsF}{black}{sl}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-osf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scit
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{b}{sl}{
-      <-> ssub * Alegreya-OsF/b/it
+\DeclareFontShape{T1}{Alegreya-OsF}{bold}{sl}{
+      <-> ssub * Alegreya-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-osf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{medium}{sl}{
+      <-> ssub * Alegreya-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{scsl}{
-      <-> ssub * Alegreya-OsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{mb}{sl}{
-      <-> ssub * Alegreya-OsF/mb/it
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-OsF}{m}{sl}{
+      <-> ssub * Alegreya-OsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{m}{scsl}{
+      <-> ssub * Alegreya-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Alegreya-OsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-sc-t1
+      <-> ssub * Alegreya-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-OsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-t1
+      <-> ssub * Alegreya-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-OsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-t1
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Alegreya-OsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-sc-t1
+      <-> ssub * Alegreya-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{m}{scsl}{
-      <-> ssub * Alegreya-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{sl}{
+      <-> ssub * Alegreya-OsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{m}{sl}{
-      <-> ssub * Alegreya-OsF/m/it
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{scsl}{
+      <-> ssub * Alegreya-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{bx}{sl}{
-      <-> ssub * Alegreya-OsF/b/sl
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{sc}{
+      <-> ssub * Alegreya-OsF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{bx}{scsl}{
-      <-> ssub * Alegreya-OsF/b/scsl
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{n}{
+      <-> ssub * Alegreya-OsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{Alegreya-OsF}{bx}{sc}{
-      <-> ssub * Alegreya-OsF/b/sc
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{it}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{sb}{scit}{
+      <-> ssub * Alegreya-OsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{sl}{
+      <-> ssub * Alegreya-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{scsl}{
+      <-> ssub * Alegreya-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{sc}{
+      <-> ssub * Alegreya-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{n}{
+      <-> ssub * Alegreya-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{it}{
+      <-> ssub * Alegreya-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{b}{scit}{
+      <-> ssub * Alegreya-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{scsl}{
+      <-> ssub * Alegreya-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{sc}{
+      <-> ssub * Alegreya-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{n}{
+      <-> ssub * Alegreya-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{it}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{eb}{scit}{
+      <-> ssub * Alegreya-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{sl}{
+      <-> ssub * Alegreya-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{scsl}{
+      <-> ssub * Alegreya-OsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{sc}{
+      <-> ssub * Alegreya-OsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{n}{
+      <-> ssub * Alegreya-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{it}{
+      <-> ssub * Alegreya-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{ub}{scit}{
+      <-> ssub * Alegreya-OsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-OsF}{bx}{n}{
       <-> ssub * Alegreya-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-OsF}{bx}{sc}{
+      <-> ssub * Alegreya-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{bx}{scsl}{
+      <-> ssub * Alegreya-OsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-OsF}{bx}{sl}{
+      <-> ssub * Alegreya-OsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-OsF}{bx}{it}{
       <-> ssub * Alegreya-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Sup.fd
index fff15cb0c91..ac5792c2a17 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-Sup.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,76 +11,301 @@
 
 \DeclareFontFamily{T1}{Alegreya-Sup}{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Regular-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{eb}{sl}{
-      <-> ssub * Alegreya-Sup/eb/it
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-Italic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{regular}{sl}{
+      <-> ssub * Alegreya-Sup/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Black-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{k}{sl}{
-      <-> ssub * Alegreya-Sup/k/it
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BlackItalic-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{black}{sl}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Bold-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{b}{sl}{
-      <-> ssub * Alegreya-Sup/b/it
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-BoldItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bold}{sl}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-Medium-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{mb}{sl}{
-      <-> ssub * Alegreya-Sup/mb/it
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-MediumItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{medium}{sl}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{sc}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBold-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{scit}{
+      <-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{extrabold}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-Sup}{m}{sl}{
+      <-> ssub * Alegreya-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{m}{scsl}{
+      <-> ssub * Alegreya-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{m}{sc}{
+      <-> ssub * Alegreya-Sup/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Sup}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-sup-t1
+      <-> ssub * Alegreya-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Sup}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-sup-t1
+      <-> ssub * Alegreya-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{m}{sl}{
-      <-> ssub * Alegreya-Sup/m/it
+\DeclareFontShape{T1}{Alegreya-Sup}{m}{scit}{
+      <-> ssub * Alegreya-Sup/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-Sup}{bx}{sl}{
-      <-> ssub * Alegreya-Sup/b/sl
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{sl}{
+      <-> ssub * Alegreya-Sup/medium/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{scsl}{
+      <-> ssub * Alegreya-Sup/medium/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{sc}{
+      <-> ssub * Alegreya-Sup/medium/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{n}{
+      <-> ssub * Alegreya-Sup/medium/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{it}{
+      <-> ssub * Alegreya-Sup/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{sb}{scit}{
+      <-> ssub * Alegreya-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{sl}{
+      <-> ssub * Alegreya-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{scsl}{
+      <-> ssub * Alegreya-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{sc}{
+      <-> ssub * Alegreya-Sup/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{n}{
+      <-> ssub * Alegreya-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{it}{
+      <-> ssub * Alegreya-Sup/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{b}{scit}{
+      <-> ssub * Alegreya-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{sl}{
+      <-> ssub * Alegreya-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{scsl}{
+      <-> ssub * Alegreya-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{sc}{
+      <-> ssub * Alegreya-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{n}{
+      <-> ssub * Alegreya-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{it}{
+      <-> ssub * Alegreya-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{eb}{scit}{
+      <-> ssub * Alegreya-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{sl}{
+      <-> ssub * Alegreya-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{scsl}{
+      <-> ssub * Alegreya-Sup/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{sc}{
+      <-> ssub * Alegreya-Sup/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{n}{
+      <-> ssub * Alegreya-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{it}{
+      <-> ssub * Alegreya-Sup/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{ub}{scit}{
+      <-> ssub * Alegreya-Sup/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-Sup}{bx}{n}{
       <-> ssub * Alegreya-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-Sup}{bx}{sc}{
+      <-> ssub * Alegreya-Sup/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bx}{scsl}{
+      <-> ssub * Alegreya-Sup/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-Sup}{bx}{sl}{
+      <-> ssub * Alegreya-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-Sup}{bx}{it}{
       <-> ssub * Alegreya-Sup/b/it
 }{}
 
+\DeclareFontShape{T1}{Alegreya-Sup}{bx}{scit}{
+      <-> ssub * Alegreya-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TLF.fd
index bcbd720b28b..92f8b2852f3 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-TLF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{T1}{Alegreya-TLF}{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{scsl}{
-      <-> ssub * Alegreya-TLF/eb/scit
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{eb}{sl}{
-      <-> ssub * Alegreya-TLF/eb/it
+\DeclareFontShape{T1}{Alegreya-TLF}{regular}{sl}{
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tlf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{scsl}{
-      <-> ssub * Alegreya-TLF/k/scit
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{k}{sl}{
-      <-> ssub * Alegreya-TLF/k/it
+\DeclareFontShape{T1}{Alegreya-TLF}{black}{sl}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tlf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scit
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{b}{sl}{
-      <-> ssub * Alegreya-TLF/b/it
+\DeclareFontShape{T1}{Alegreya-TLF}{bold}{sl}{
+      <-> ssub * Alegreya-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tlf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{medium}{sl}{
+      <-> ssub * Alegreya-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{scsl}{
-      <-> ssub * Alegreya-TLF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{mb}{sl}{
-      <-> ssub * Alegreya-TLF/mb/it
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-TLF}{m}{sl}{
+      <-> ssub * Alegreya-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{m}{scsl}{
+      <-> ssub * Alegreya-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TLF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-sc-t1
+      <-> ssub * Alegreya-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TLF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-t1
+      <-> ssub * Alegreya-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TLF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-t1
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TLF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-sc-t1
+      <-> ssub * Alegreya-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{m}{scsl}{
-      <-> ssub * Alegreya-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{sl}{
+      <-> ssub * Alegreya-TLF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{m}{sl}{
-      <-> ssub * Alegreya-TLF/m/it
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{scsl}{
+      <-> ssub * Alegreya-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{bx}{sl}{
-      <-> ssub * Alegreya-TLF/b/sl
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{sc}{
+      <-> ssub * Alegreya-TLF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{bx}{scsl}{
-      <-> ssub * Alegreya-TLF/b/scsl
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{n}{
+      <-> ssub * Alegreya-TLF/medium/n
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TLF}{bx}{sc}{
-      <-> ssub * Alegreya-TLF/b/sc
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{it}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{sb}{scit}{
+      <-> ssub * Alegreya-TLF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{sl}{
+      <-> ssub * Alegreya-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{scsl}{
+      <-> ssub * Alegreya-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{sc}{
+      <-> ssub * Alegreya-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{n}{
+      <-> ssub * Alegreya-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{it}{
+      <-> ssub * Alegreya-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{b}{scit}{
+      <-> ssub * Alegreya-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{scsl}{
+      <-> ssub * Alegreya-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{sc}{
+      <-> ssub * Alegreya-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{n}{
+      <-> ssub * Alegreya-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{it}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{eb}{scit}{
+      <-> ssub * Alegreya-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{sl}{
+      <-> ssub * Alegreya-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{scsl}{
+      <-> ssub * Alegreya-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{sc}{
+      <-> ssub * Alegreya-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{n}{
+      <-> ssub * Alegreya-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{it}{
+      <-> ssub * Alegreya-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{ub}{scit}{
+      <-> ssub * Alegreya-TLF/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TLF}{bx}{n}{
       <-> ssub * Alegreya-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-TLF}{bx}{sc}{
+      <-> ssub * Alegreya-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{bx}{scsl}{
+      <-> ssub * Alegreya-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TLF}{bx}{sl}{
+      <-> ssub * Alegreya-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-TLF}{bx}{it}{
       <-> ssub * Alegreya-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TOsF.fd
index dcda137af5c..f29204ad5b1 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1Alegreya-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1Alegreya-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/Alegreya-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/Alegreya-TOsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,142 +11,305 @@
 
 \DeclareFontFamily{T1}{Alegreya-TOsF}{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{sc}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Regular-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{scit}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{scit}{
+      <-0> \Alegreya@@scale Alegreya-Italic-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{scsl}{
-      <-> ssub * Alegreya-TOsF/eb/scit
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{sl}{
-      <-> ssub * Alegreya-TOsF/eb/it
+\DeclareFontShape{T1}{Alegreya-TOsF}{regular}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{sc}{
-      <-> \Alegreya@@scale Alegreya-Black-tosf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Black-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{n}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{it}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{scit}{
-      <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BlackItalic-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{scsl}{
-      <-> ssub * Alegreya-TOsF/k/scit
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{k}{sl}{
-      <-> ssub * Alegreya-TOsF/k/it
+\DeclareFontShape{T1}{Alegreya-TOsF}{black}{sl}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{sc}{
-      <-> \Alegreya@@scale Alegreya-Bold-tosf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Bold-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{n}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{it}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{scit}{
-      <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-BoldItalic-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scit
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{b}{sl}{
-      <-> ssub * Alegreya-TOsF/b/it
+\DeclareFontShape{T1}{Alegreya-TOsF}{bold}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{sc}{
-      <-> \Alegreya@@scale Alegreya-Medium-tosf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{sc}{
+      <-0> \Alegreya@@scale Alegreya-Medium-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{n}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{scit}{
-      <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{scit}{
+      <-0> \Alegreya@@scale Alegreya-MediumItalic-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-MediumItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{medium}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{scsl}{
-      <-> ssub * Alegreya-TOsF/mb/scit
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{sc}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBold-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{mb}{sl}{
-      <-> ssub * Alegreya-TOsF/mb/it
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{scit}{
+      <-0> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-sc-t1
+      <0-> \Alegreya@@scale AlegreyaSC-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{m}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{m}{scsl}{
+      <-> ssub * Alegreya-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TOsF}{m}{sc}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-sc-t1
+      <-> ssub * Alegreya-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TOsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-t1
+      <-> ssub * Alegreya-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TOsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-t1
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TOsF}{m}{scit}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-sc-t1
+      <-> ssub * Alegreya-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{m}{scsl}{
-      <-> ssub * Alegreya-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{m}{sl}{
-      <-> ssub * Alegreya-TOsF/m/it
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{scsl}{
+      <-> ssub * Alegreya-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{sl}{
-      <-> ssub * Alegreya-TOsF/b/sl
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{sc}{
+      <-> ssub * Alegreya-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{scsl}{
-      <-> ssub * Alegreya-TOsF/b/scsl
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{n}{
+      <-> ssub * Alegreya-TOsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{sc}{
-      <-> ssub * Alegreya-TOsF/b/sc
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{it}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{sb}{scit}{
+      <-> ssub * Alegreya-TOsF/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{scsl}{
+      <-> ssub * Alegreya-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{sc}{
+      <-> ssub * Alegreya-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{n}{
+      <-> ssub * Alegreya-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{it}{
+      <-> ssub * Alegreya-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{b}{scit}{
+      <-> ssub * Alegreya-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{scsl}{
+      <-> ssub * Alegreya-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{sc}{
+      <-> ssub * Alegreya-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{n}{
+      <-> ssub * Alegreya-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{it}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{eb}{scit}{
+      <-> ssub * Alegreya-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{sl}{
+      <-> ssub * Alegreya-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{scsl}{
+      <-> ssub * Alegreya-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{sc}{
+      <-> ssub * Alegreya-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{n}{
+      <-> ssub * Alegreya-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{it}{
+      <-> ssub * Alegreya-TOsF/black/it
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{ub}{scit}{
+      <-> ssub * Alegreya-TOsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{Alegreya-TOsF}{bx}{n}{
       <-> ssub * Alegreya-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{sc}{
+      <-> ssub * Alegreya-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{scsl}{
+      <-> ssub * Alegreya-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Alegreya-TOsF}{bx}{sl}{
+      <-> ssub * Alegreya-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{Alegreya-TOsF}{bx}{it}{
       <-> ssub * Alegreya-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Inf.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Inf.fd
index f97508e768f..b05ba40493d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Inf.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-Inf.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-Inf.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-Inf.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-Inf}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-t1
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{sl}{
-      <-> ssub * AlegreyaSans-Inf/l/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-t1
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{k}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{k}{sl}{
-      <-> ssub * AlegreyaSans-Inf/k/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-inf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{black}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Inf/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{light}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-inf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{sl}{
+      <-> ssub * AlegreyaSans-Inf/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{sc}{
+      <-> ssub * AlegreyaSans-Inf/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{n}{
+      <-> ssub * AlegreyaSans-Inf/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{it}{
+      <-> ssub * AlegreyaSans-Inf/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{el}{scit}{
+      <-> ssub * AlegreyaSans-Inf/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{sl}{
+      <-> ssub * AlegreyaSans-Inf/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{sc}{
+      <-> ssub * AlegreyaSans-Inf/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{n}{
+      <-> ssub * AlegreyaSans-Inf/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{it}{
+      <-> ssub * AlegreyaSans-Inf/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{l}{scit}{
+      <-> ssub * AlegreyaSans-Inf/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{sl}{
+      <-> ssub * AlegreyaSans-Inf/regular/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{sc}{
+      <-> ssub * AlegreyaSans-Inf/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-inf-t1
+      <-> ssub * AlegreyaSans-Inf/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-inf-t1
+      <-> ssub * AlegreyaSans-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{sl}{
-      <-> ssub * AlegreyaSans-Inf/m/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{m}{scit}{
+      <-> ssub * AlegreyaSans-Inf/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-inf-t1
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-inf-t1
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{i}{sl}{
-      <-> ssub * AlegreyaSans-Inf/i/it
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Inf/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{n}{
+      <-> ssub * AlegreyaSans-Inf/medium/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{it}{
+      <-> ssub * AlegreyaSans-Inf/medium/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{sl}{
+      <-> ssub * AlegreyaSans-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{sc}{
+      <-> ssub * AlegreyaSans-Inf/bold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{n}{
+      <-> ssub * AlegreyaSans-Inf/bold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{it}{
+      <-> ssub * AlegreyaSans-Inf/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{b}{scit}{
+      <-> ssub * AlegreyaSans-Inf/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{n}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{it}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Inf/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Inf/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Inf/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{n}{
+      <-> ssub * AlegreyaSans-Inf/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{it}{
+      <-> ssub * AlegreyaSans-Inf/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Inf/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{n}{
       <-> ssub * AlegreyaSans-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Inf/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Inf/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Inf/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{it}{
       <-> ssub * AlegreyaSans-Inf/b/it
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-Inf}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Inf/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-LF.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-LF.fd
index 86548447ef5..c2b4b2e9457 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-LF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-LF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-LF}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-LF/l/scit
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{sl}{
-      <-> ssub * AlegreyaSans-LF/l/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/eb/scit
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-LF/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{black}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-LF/k/scit
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{k}{sl}{
-      <-> ssub * AlegreyaSans-LF/k/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scit
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{light}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-LF/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{sc}{
+      <-> ssub * AlegreyaSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{n}{
+      <-> ssub * AlegreyaSans-LF/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{it}{
+      <-> ssub * AlegreyaSans-LF/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{el}{scit}{
+      <-> ssub * AlegreyaSans-LF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{sc}{
+      <-> ssub * AlegreyaSans-LF/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{n}{
+      <-> ssub * AlegreyaSans-LF/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{it}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{l}{scit}{
+      <-> ssub * AlegreyaSans-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-LF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{m}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-LF/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-LF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-LF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-sc-t1
+      <-> ssub * AlegreyaSans-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-LF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-t1
+      <-> ssub * AlegreyaSans-LF/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-LF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-t1
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-LF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-sc-t1
+      <-> ssub * AlegreyaSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-LF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{m}{sl}{
-      <-> ssub * AlegreyaSans-LF/m/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-LF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{n}{
+      <-> ssub * AlegreyaSans-LF/medium/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{it}{
+      <-> ssub * AlegreyaSans-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-LF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-LF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{i}{sl}{
-      <-> ssub * AlegreyaSans-LF/i/it
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-LF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{sc}{
+      <-> ssub * AlegreyaSans-LF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-LF/b/scsl
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{n}{
+      <-> ssub * AlegreyaSans-LF/bold/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-LF/b/sc
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{it}{
+      <-> ssub * AlegreyaSans-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{b}{scit}{
+      <-> ssub * AlegreyaSans-LF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{n}{
+      <-> ssub * AlegreyaSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{it}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-LF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-LF/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{n}{
+      <-> ssub * AlegreyaSans-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{it}{
+      <-> ssub * AlegreyaSans-LF/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-LF/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{n}{
       <-> ssub * AlegreyaSans-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-LF}{bx}{it}{
       <-> ssub * AlegreyaSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-OsF.fd
index eba9fae1e1d..c65a35eecb3 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-OsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-OsF}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/l/scit
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-OsF/l/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/eb/scit
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/k/scit
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-OsF/k/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scit
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{n}{
+      <-> ssub * AlegreyaSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{it}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-OsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{n}{
+      <-> ssub * AlegreyaSans-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{it}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-sc-t1
+      <-> ssub * AlegreyaSans-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-t1
+      <-> ssub * AlegreyaSans-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-t1
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-sc-t1
+      <-> ssub * AlegreyaSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-OsF/m/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-OsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-OsF/i/it
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-OsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-OsF/b/scsl
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{n}{
+      <-> ssub * AlegreyaSans-OsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-OsF/b/sc
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{it}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-OsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-OsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{n}{
       <-> ssub * AlegreyaSans-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-OsF}{bx}{it}{
       <-> ssub * AlegreyaSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Sup.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Sup.fd
index 64959c8d698..0ea804129dc 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-Sup.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-Sup.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-Sup.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,100 +11,409 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-Sup}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-t1
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{sl}{
-      <-> ssub * AlegreyaSans-Sup/l/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-t1
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{regular}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Black-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{k}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{k}{sl}{
-      <-> ssub * AlegreyaSans-Sup/k/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-sup-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{black}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{thin}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{mb}{sl}{
-      <-> ssub * AlegreyaSans-Sup/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{medium}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-Light-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{light}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{sc}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{scit}{
+      <-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-sup-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{sl}{
+      <-> ssub * AlegreyaSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{sc}{
+      <-> ssub * AlegreyaSans-Sup/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{n}{
+      <-> ssub * AlegreyaSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{it}{
+      <-> ssub * AlegreyaSans-Sup/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{el}{scit}{
+      <-> ssub * AlegreyaSans-Sup/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{sl}{
+      <-> ssub * AlegreyaSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{sc}{
+      <-> ssub * AlegreyaSans-Sup/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{n}{
+      <-> ssub * AlegreyaSans-Sup/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{it}{
+      <-> ssub * AlegreyaSans-Sup/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{l}{scit}{
+      <-> ssub * AlegreyaSans-Sup/light/scit
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{sl}{
+      <-> ssub * AlegreyaSans-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{sc}{
+      <-> ssub * AlegreyaSans-Sup/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-sup-t1
+      <-> ssub * AlegreyaSans-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-sup-t1
+      <-> ssub * AlegreyaSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{sl}{
-      <-> ssub * AlegreyaSans-Sup/m/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{m}{scit}{
+      <-> ssub * AlegreyaSans-Sup/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-sup-t1
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-sup-t1
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{i}{sl}{
-      <-> ssub * AlegreyaSans-Sup/i/it
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{sl}{
-      <-> ssub * AlegreyaSans-Sup/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{n}{
+      <-> ssub * AlegreyaSans-Sup/medium/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{it}{
+      <-> ssub * AlegreyaSans-Sup/medium/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{sb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/medium/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{sl}{
+      <-> ssub * AlegreyaSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{sc}{
+      <-> ssub * AlegreyaSans-Sup/bold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{n}{
+      <-> ssub * AlegreyaSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{it}{
+      <-> ssub * AlegreyaSans-Sup/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{b}{scit}{
+      <-> ssub * AlegreyaSans-Sup/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{sl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{sc}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{n}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{it}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{eb}{scit}{
+      <-> ssub * AlegreyaSans-Sup/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{sl}{
+      <-> ssub * AlegreyaSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{sc}{
+      <-> ssub * AlegreyaSans-Sup/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{n}{
+      <-> ssub * AlegreyaSans-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{it}{
+      <-> ssub * AlegreyaSans-Sup/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{ub}{scit}{
+      <-> ssub * AlegreyaSans-Sup/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{n}{
       <-> ssub * AlegreyaSans-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{sc}{
+      <-> ssub * AlegreyaSans-Sup/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-Sup/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{sl}{
+      <-> ssub * AlegreyaSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{it}{
       <-> ssub * AlegreyaSans-Sup/b/it
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-Sup}{bx}{scit}{
+      <-> ssub * AlegreyaSans-Sup/b/scit
+}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TLF.fd
index 7939ebe1be0..89dc448b2e0 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-TLF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-TLF}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/l/scit
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TLF/l/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/eb/scit
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/k/scit
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TLF/k/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scit
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{n}{
+      <-> ssub * AlegreyaSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{it}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TLF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{n}{
+      <-> ssub * AlegreyaSans-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{it}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-sc-t1
+      <-> ssub * AlegreyaSans-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-t1
+      <-> ssub * AlegreyaSans-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-t1
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-sc-t1
+      <-> ssub * AlegreyaSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TLF/m/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TLF/medium/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TLF/i/it
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TLF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TLF/b/scsl
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{n}{
+      <-> ssub * AlegreyaSans-TLF/bold/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TLF/b/sc
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{it}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TLF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TLF/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{n}{
       <-> ssub * AlegreyaSans-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-TLF}{bx}{it}{
       <-> ssub * AlegreyaSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TOsF.fd
index a2df2766fd0..b56ab1e83d2 100644
--- a/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/T1AlegreyaSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{T1AlegreyaSans-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for T1/AlegreyaSans-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for T1/AlegreyaSans-TOsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,190 +11,417 @@
 
 \DeclareFontFamily{T1}{AlegreyaSans-TOsF}{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/l/scit
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/l/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-t1
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/scit
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Thin-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ThinItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/k/scit
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/k/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scit
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{n}{
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{it}{
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-MediumItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{sc}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{scit}{
+      <-0> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-sc-t1
+      <0-> \AlegreyaSans@@scale AlegreyaSansSC-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{n}{
+      <-> ssub * AlegreyaSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{it}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{el}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/thin/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{n}{
+      <-> ssub * AlegreyaSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{it}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{l}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/scit
+
+%   m --> regular
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-sc-t1
+      <-> ssub * AlegreyaSans-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-t1
+      <-> ssub * AlegreyaSans-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-t1
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-sc-t1
+      <-> ssub * AlegreyaSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/m/scit
+
+%   sb --> medium
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/m/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{sc}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/medium/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{scit}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{sb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/i/scit
+
+%   b --> bold
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/i/it
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/sl
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{scsl}{
-      <-> ssub * AlegreyaSans-TOsF/b/scsl
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{n}{
+      <-> ssub * AlegreyaSans-TOsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{sc}{
-      <-> ssub * AlegreyaSans-TOsF/b/sc
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{it}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{b}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/bold/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{eb}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{ub}{scit}{
+      <-> ssub * AlegreyaSans-TOsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{n}{
       <-> ssub * AlegreyaSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{sc}{
+      <-> ssub * AlegreyaSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{scsl}{
+      <-> ssub * AlegreyaSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{AlegreyaSans-TOsF}{bx}{it}{
       <-> ssub * AlegreyaSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-LF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-LF.fd
index b200bbb1212..63eea414065 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1Alegreya-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/Alegreya-LF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/Alegreya-LF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,74 +11,167 @@
 
 \DeclareFontFamily{TS1}{Alegreya-LF}{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Alegreya-LF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Alegreya-LF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{eb}{sl}{
-      <-> ssub * Alegreya-LF/eb/it
+\DeclareFontShape{TS1}{Alegreya-LF}{regular}{sl}{
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Alegreya-LF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{k}{it}{
+\DeclareFontShape{TS1}{Alegreya-LF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{k}{sl}{
-      <-> ssub * Alegreya-LF/k/it
+\DeclareFontShape{TS1}{Alegreya-LF}{black}{sl}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Alegreya-LF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{b}{it}{
+\DeclareFontShape{TS1}{Alegreya-LF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{b}{sl}{
-      <-> ssub * Alegreya-LF/b/it
+\DeclareFontShape{TS1}{Alegreya-LF}{bold}{sl}{
+      <-> ssub * Alegreya-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{Alegreya-LF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{mb}{it}{
+\DeclareFontShape{TS1}{Alegreya-LF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{mb}{sl}{
-      <-> ssub * Alegreya-LF/mb/it
+\DeclareFontShape{TS1}{Alegreya-LF}{medium}{sl}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{Alegreya-LF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{extrabold}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Alegreya-LF}{m}{sl}{
+      <-> ssub * Alegreya-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-LF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-lf-ts1
+      <-> ssub * Alegreya-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-LF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-lf-ts1
+      <-> ssub * Alegreya-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{m}{sl}{
-      <-> ssub * Alegreya-LF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{Alegreya-LF}{sb}{sl}{
+      <-> ssub * Alegreya-LF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-LF}{bx}{sl}{
-      <-> ssub * Alegreya-LF/b/sl
+\DeclareFontShape{TS1}{Alegreya-LF}{sb}{n}{
+      <-> ssub * Alegreya-LF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{sb}{it}{
+      <-> ssub * Alegreya-LF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Alegreya-LF}{b}{sl}{
+      <-> ssub * Alegreya-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{b}{n}{
+      <-> ssub * Alegreya-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{b}{it}{
+      <-> ssub * Alegreya-LF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{Alegreya-LF}{eb}{sl}{
+      <-> ssub * Alegreya-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{eb}{n}{
+      <-> ssub * Alegreya-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{eb}{it}{
+      <-> ssub * Alegreya-LF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{Alegreya-LF}{ub}{sl}{
+      <-> ssub * Alegreya-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{ub}{n}{
+      <-> ssub * Alegreya-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-LF}{ub}{it}{
+      <-> ssub * Alegreya-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-LF}{bx}{n}{
       <-> ssub * Alegreya-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{Alegreya-LF}{bx}{sl}{
+      <-> ssub * Alegreya-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{Alegreya-LF}{bx}{it}{
       <-> ssub * Alegreya-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-OsF.fd
index 3f9c9474265..80637d440a7 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1Alegreya-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/Alegreya-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/Alegreya-OsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,74 +11,167 @@
 
 \DeclareFontFamily{TS1}{Alegreya-OsF}{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Alegreya-OsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{sl}{
-      <-> ssub * Alegreya-OsF/eb/it
+\DeclareFontShape{TS1}{Alegreya-OsF}{regular}{sl}{
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{k}{it}{
+\DeclareFontShape{TS1}{Alegreya-OsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{k}{sl}{
-      <-> ssub * Alegreya-OsF/k/it
+\DeclareFontShape{TS1}{Alegreya-OsF}{black}{sl}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{b}{it}{
+\DeclareFontShape{TS1}{Alegreya-OsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{b}{sl}{
-      <-> ssub * Alegreya-OsF/b/it
+\DeclareFontShape{TS1}{Alegreya-OsF}{bold}{sl}{
+      <-> ssub * Alegreya-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{Alegreya-OsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{mb}{sl}{
-      <-> ssub * Alegreya-OsF/mb/it
+\DeclareFontShape{TS1}{Alegreya-OsF}{medium}{sl}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{m}{sl}{
+      <-> ssub * Alegreya-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-OsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-osf-ts1
+      <-> ssub * Alegreya-OsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-OsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-osf-ts1
+      <-> ssub * Alegreya-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{m}{sl}{
-      <-> ssub * Alegreya-OsF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{sb}{sl}{
+      <-> ssub * Alegreya-OsF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-OsF}{bx}{sl}{
-      <-> ssub * Alegreya-OsF/b/sl
+\DeclareFontShape{TS1}{Alegreya-OsF}{sb}{n}{
+      <-> ssub * Alegreya-OsF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{sb}{it}{
+      <-> ssub * Alegreya-OsF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{b}{sl}{
+      <-> ssub * Alegreya-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{b}{n}{
+      <-> ssub * Alegreya-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{b}{it}{
+      <-> ssub * Alegreya-OsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{sl}{
+      <-> ssub * Alegreya-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{n}{
+      <-> ssub * Alegreya-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{eb}{it}{
+      <-> ssub * Alegreya-OsF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{ub}{sl}{
+      <-> ssub * Alegreya-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{ub}{n}{
+      <-> ssub * Alegreya-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-OsF}{ub}{it}{
+      <-> ssub * Alegreya-OsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-OsF}{bx}{n}{
       <-> ssub * Alegreya-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{Alegreya-OsF}{bx}{sl}{
+      <-> ssub * Alegreya-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{Alegreya-OsF}{bx}{it}{
       <-> ssub * Alegreya-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TLF.fd
index c2f557ca6fd..f93137b6317 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1Alegreya-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/Alegreya-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/Alegreya-TLF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,74 +11,167 @@
 
 \DeclareFontFamily{TS1}{Alegreya-TLF}{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Alegreya-TLF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{sl}{
-      <-> ssub * Alegreya-TLF/eb/it
+\DeclareFontShape{TS1}{Alegreya-TLF}{regular}{sl}{
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{k}{it}{
+\DeclareFontShape{TS1}{Alegreya-TLF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{k}{sl}{
-      <-> ssub * Alegreya-TLF/k/it
+\DeclareFontShape{TS1}{Alegreya-TLF}{black}{sl}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{b}{it}{
+\DeclareFontShape{TS1}{Alegreya-TLF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{b}{sl}{
-      <-> ssub * Alegreya-TLF/b/it
+\DeclareFontShape{TS1}{Alegreya-TLF}{bold}{sl}{
+      <-> ssub * Alegreya-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{Alegreya-TLF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{mb}{sl}{
-      <-> ssub * Alegreya-TLF/mb/it
+\DeclareFontShape{TS1}{Alegreya-TLF}{medium}{sl}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{m}{sl}{
+      <-> ssub * Alegreya-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TLF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tlf-ts1
+      <-> ssub * Alegreya-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TLF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tlf-ts1
+      <-> ssub * Alegreya-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{m}{sl}{
-      <-> ssub * Alegreya-TLF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{sb}{sl}{
+      <-> ssub * Alegreya-TLF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TLF}{bx}{sl}{
-      <-> ssub * Alegreya-TLF/b/sl
+\DeclareFontShape{TS1}{Alegreya-TLF}{sb}{n}{
+      <-> ssub * Alegreya-TLF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{sb}{it}{
+      <-> ssub * Alegreya-TLF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{b}{sl}{
+      <-> ssub * Alegreya-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{b}{n}{
+      <-> ssub * Alegreya-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{b}{it}{
+      <-> ssub * Alegreya-TLF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{sl}{
+      <-> ssub * Alegreya-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{n}{
+      <-> ssub * Alegreya-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{eb}{it}{
+      <-> ssub * Alegreya-TLF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{ub}{sl}{
+      <-> ssub * Alegreya-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{ub}{n}{
+      <-> ssub * Alegreya-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TLF}{ub}{it}{
+      <-> ssub * Alegreya-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TLF}{bx}{n}{
       <-> ssub * Alegreya-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{Alegreya-TLF}{bx}{sl}{
+      <-> ssub * Alegreya-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{Alegreya-TLF}{bx}{it}{
       <-> ssub * Alegreya-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TOsF.fd
index 4543f8bd9fe..c344790bc29 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1Alegreya-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1Alegreya-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/Alegreya-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/Alegreya-TOsF.]
 
 \expandafter\ifx\csname Alegreya@scale\endcsname\relax
     \let\Alegreya@@scale\@empty
@@ -11,74 +11,167 @@
 
 \DeclareFontFamily{TS1}{Alegreya-TOsF}{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{n}{
-      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{regular}{n}{
+      <-> \Alegreya@@scale Alegreya-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{it}{
-      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Alegreya-TOsF}{regular}{it}{
+      <-> \Alegreya@@scale Alegreya-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{sl}{
-      <-> ssub * Alegreya-TOsF/eb/it
+\DeclareFontShape{TS1}{Alegreya-TOsF}{regular}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{k}{n}{
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{black}{n}{
       <-> \Alegreya@@scale Alegreya-Black-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{k}{it}{
+\DeclareFontShape{TS1}{Alegreya-TOsF}{black}{it}{
       <-> \Alegreya@@scale Alegreya-BlackItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{k}{sl}{
-      <-> ssub * Alegreya-TOsF/k/it
+\DeclareFontShape{TS1}{Alegreya-TOsF}{black}{sl}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{bold}{n}{
       <-> \Alegreya@@scale Alegreya-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{it}{
+\DeclareFontShape{TS1}{Alegreya-TOsF}{bold}{it}{
       <-> \Alegreya@@scale Alegreya-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{sl}{
-      <-> ssub * Alegreya-TOsF/b/it
+\DeclareFontShape{TS1}{Alegreya-TOsF}{bold}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{medium}{n}{
       <-> \Alegreya@@scale Alegreya-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{Alegreya-TOsF}{medium}{it}{
       <-> \Alegreya@@scale Alegreya-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{mb}{sl}{
-      <-> ssub * Alegreya-TOsF/mb/it
+\DeclareFontShape{TS1}{Alegreya-TOsF}{medium}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{extrabold}{n}{
+      <-> \Alegreya@@scale Alegreya-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{extrabold}{it}{
+      <-> \Alegreya@@scale Alegreya-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{extrabold}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{m}{sl}{
+      <-> ssub * Alegreya-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TOsF}{m}{n}{
-      <-> \Alegreya@@scale Alegreya-Regular-tosf-ts1
+      <-> ssub * Alegreya-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TOsF}{m}{it}{
-      <-> \Alegreya@@scale Alegreya-Italic-tosf-ts1
+      <-> ssub * Alegreya-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{m}{sl}{
-      <-> ssub * Alegreya-TOsF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{sb}{sl}{
+      <-> ssub * Alegreya-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{Alegreya-TOsF}{bx}{sl}{
-      <-> ssub * Alegreya-TOsF/b/sl
+\DeclareFontShape{TS1}{Alegreya-TOsF}{sb}{n}{
+      <-> ssub * Alegreya-TOsF/medium/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{sb}{it}{
+      <-> ssub * Alegreya-TOsF/medium/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{sl}{
+      <-> ssub * Alegreya-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{n}{
+      <-> ssub * Alegreya-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{b}{it}{
+      <-> ssub * Alegreya-TOsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{sl}{
+      <-> ssub * Alegreya-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{n}{
+      <-> ssub * Alegreya-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{eb}{it}{
+      <-> ssub * Alegreya-TOsF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{ub}{sl}{
+      <-> ssub * Alegreya-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{ub}{n}{
+      <-> ssub * Alegreya-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{Alegreya-TOsF}{ub}{it}{
+      <-> ssub * Alegreya-TOsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Alegreya-TOsF}{bx}{n}{
       <-> ssub * Alegreya-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{Alegreya-TOsF}{bx}{sl}{
+      <-> ssub * Alegreya-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{Alegreya-TOsF}{bx}{it}{
       <-> ssub * Alegreya-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-LF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-LF.fd
index b4b442a5655..aeed484d601 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1AlegreyaSans-LF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/AlegreyaSans-LF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/AlegreyaSans-LF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,98 +11,227 @@
 
 \DeclareFontFamily{TS1}{AlegreyaSans-LF}{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{sl}{
-      <-> ssub * AlegreyaSans-LF/l/it
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ts1
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-LF/eb/it
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{black}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-lf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-lf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{k}{sl}{
-      <-> ssub * AlegreyaSans-LF/k/it
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/it
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{mb}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-LF/mb/it
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{light}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{el}{sl}{
+      <-> ssub * AlegreyaSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{el}{n}{
+      <-> ssub * AlegreyaSans-LF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{el}{it}{
+      <-> ssub * AlegreyaSans-LF/thin/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{sl}{
+      <-> ssub * AlegreyaSans-LF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{n}{
+      <-> ssub * AlegreyaSans-LF/light/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{l}{it}{
+      <-> ssub * AlegreyaSans-LF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{m}{sl}{
+      <-> ssub * AlegreyaSans-LF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-LF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-lf-ts1
+      <-> ssub * AlegreyaSans-LF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-LF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-lf-ts1
+      <-> ssub * AlegreyaSans-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{m}{sl}{
-      <-> ssub * AlegreyaSans-LF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-LF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-lf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{sb}{n}{
+      <-> ssub * AlegreyaSans-LF/medium/n
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-lf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{sb}{it}{
+      <-> ssub * AlegreyaSans-LF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{i}{sl}{
-      <-> ssub * AlegreyaSans-LF/i/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{sl}{
+      <-> ssub * AlegreyaSans-LF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-LF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-LF/b/sl
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{n}{
+      <-> ssub * AlegreyaSans-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{b}{it}{
+      <-> ssub * AlegreyaSans-LF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{n}{
+      <-> ssub * AlegreyaSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{eb}{it}{
+      <-> ssub * AlegreyaSans-LF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{ub}{n}{
+      <-> ssub * AlegreyaSans-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{ub}{it}{
+      <-> ssub * AlegreyaSans-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-LF}{bx}{n}{
       <-> ssub * AlegreyaSans-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{AlegreyaSans-LF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{AlegreyaSans-LF}{bx}{it}{
       <-> ssub * AlegreyaSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-OsF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-OsF.fd
index dbab01f3d83..4d6b2b03a88 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1AlegreyaSans-OsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/AlegreyaSans-OsF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/AlegreyaSans-OsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,98 +11,227 @@
 
 \DeclareFontFamily{TS1}{AlegreyaSans-OsF}{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-OsF/l/it
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ts1
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/eb/it
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-osf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-osf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-OsF/k/it
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/it
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{mb}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-OsF/mb/it
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{el}{n}{
+      <-> ssub * AlegreyaSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{el}{it}{
+      <-> ssub * AlegreyaSans-OsF/thin/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{n}{
+      <-> ssub * AlegreyaSans-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{l}{it}{
+      <-> ssub * AlegreyaSans-OsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-OsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-osf-ts1
+      <-> ssub * AlegreyaSans-OsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-OsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-osf-ts1
+      <-> ssub * AlegreyaSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-OsF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-osf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-OsF/medium/n
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-osf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-OsF/i/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-OsF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-OsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-OsF/b/sl
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{n}{
+      <-> ssub * AlegreyaSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{b}{it}{
+      <-> ssub * AlegreyaSans-OsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-OsF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-OsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-OsF}{bx}{n}{
       <-> ssub * AlegreyaSans-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{AlegreyaSans-OsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{AlegreyaSans-OsF}{bx}{it}{
       <-> ssub * AlegreyaSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd
index 5c98573ff01..5a332af54c4 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1AlegreyaSans-TLF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/AlegreyaSans-TLF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/AlegreyaSans-TLF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,98 +11,227 @@
 
 \DeclareFontFamily{TS1}{AlegreyaSans-TLF}{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TLF/l/it
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ts1
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/eb/it
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tlf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TLF/k/it
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/it
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{mb}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TLF/mb/it
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{el}{n}{
+      <-> ssub * AlegreyaSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{el}{it}{
+      <-> ssub * AlegreyaSans-TLF/thin/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{n}{
+      <-> ssub * AlegreyaSans-TLF/light/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{l}{it}{
+      <-> ssub * AlegreyaSans-TLF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TLF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tlf-ts1
+      <-> ssub * AlegreyaSans-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TLF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tlf-ts1
+      <-> ssub * AlegreyaSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TLF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tlf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TLF/medium/n
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tlf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TLF/i/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TLF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TLF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TLF/b/sl
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{n}{
+      <-> ssub * AlegreyaSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{b}{it}{
+      <-> ssub * AlegreyaSans-TLF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TLF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TLF}{bx}{n}{
       <-> ssub * AlegreyaSans-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{AlegreyaSans-TLF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{AlegreyaSans-TLF}{bx}{it}{
       <-> ssub * AlegreyaSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd
index 84069fdba30..2f8f086118d 100644
--- a/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/08/02
+%% Generated by autoinst on 2019/10/08
 %%
 \ProvidesFile{TS1AlegreyaSans-TOsF.fd}
-    [2018/08/02 (autoinst)  Font definitions for TS1/AlegreyaSans-TOsF.]
+    [2019/10/08 (autoinst)  Font definitions for TS1/AlegreyaSans-TOsF.]
 
 \expandafter\ifx\csname AlegreyaSans@scale\endcsname\relax
     \let\AlegreyaSans@@scale\@empty
@@ -11,98 +11,227 @@
 
 \DeclareFontFamily{TS1}{AlegreyaSans-TOsF}{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{regular}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{regular}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/l/it
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{regular}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ts1
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{black}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{black}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/eb/it
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{black}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{k}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Black-tosf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{thin}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{k}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-BlackItalic-tosf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{thin}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{k}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/k/it
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{thin}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{n}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bold}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bold}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/it
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{medium}{n}{
       <-> \AlegreyaSans@@scale AlegreyaSans-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{mb}{it}{
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{medium}{it}{
       <-> \AlegreyaSans@@scale AlegreyaSans-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{mb}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/mb/it
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{medium}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{light}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{light}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{light}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{extrabold}{n}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{extrabold}{it}{
+      <-> \AlegreyaSans@@scale AlegreyaSans-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{extrabold}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   el --> thin
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{el}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{el}{n}{
+      <-> ssub * AlegreyaSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{el}{it}{
+      <-> ssub * AlegreyaSans-TOsF/thin/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{n}{
+      <-> ssub * AlegreyaSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{l}{it}{
+      <-> ssub * AlegreyaSans-TOsF/light/it
+}{}
+
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{m}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TOsF}{m}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Regular-tosf-ts1
+      <-> ssub * AlegreyaSans-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TOsF}{m}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Italic-tosf-ts1
+      <-> ssub * AlegreyaSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{m}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/m/it
+
+%   sb --> medium
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{sb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/medium/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{i}{n}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-Thin-tosf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{sb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/medium/n
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{i}{it}{
-      <-> \AlegreyaSans@@scale AlegreyaSans-ThinItalic-tosf-ts1
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{sb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{i}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/i/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bx}{sl}{
-      <-> ssub * AlegreyaSans-TOsF/b/sl
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{n}{
+      <-> ssub * AlegreyaSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{b}{it}{
+      <-> ssub * AlegreyaSans-TOsF/bold/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{n}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{eb}{it}{
+      <-> ssub * AlegreyaSans-TOsF/extrabold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{ub}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{ub}{n}{
+      <-> ssub * AlegreyaSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{ub}{it}{
+      <-> ssub * AlegreyaSans-TOsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bx}{n}{
       <-> ssub * AlegreyaSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bx}{sl}{
+      <-> ssub * AlegreyaSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{AlegreyaSans-TOsF}{bx}{it}{
       <-> ssub * AlegreyaSans-TOsF/b/it
 }{}