1 files changed, 380 insertions, 128 deletions
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
index 22a6c224afc..665c976178f 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/05/23
+%% Generated by autoinst on 2019/04/04
 %%
 \ProvidesFile{LY1FiraSans-TLF.fd}
-    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
+    [2019/04/04 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -11,286 +11,538 @@
 
 \DeclareFontFamily{LY1}{FiraSans-TLF}{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sc}{
-      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{n}{
-      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{it}{
-      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scit}{
-      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scsl}{
-      <-> ssub * FiraSans-TLF/ul/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{scsl}{
+      <-> ssub * FiraSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sl}{
-      <-> ssub * FiraSans-TLF/ul/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{regular}{sl}{
+      <-> ssub * FiraSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sc}{
-      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{n}{
-      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{it}{
-      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scit}{
-      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scsl}{
-      <-> ssub * FiraSans-TLF/eb/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{scsl}{
+      <-> ssub * FiraSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sl}{
-      <-> ssub * FiraSans-TLF/eb/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{thin}{sl}{
+      <-> ssub * FiraSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sc}{
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{sc}{
       <-> \FiraSans@@scale FiraSans-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{n}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{n}{
       <-> \FiraSans@@scale FiraSans-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{it}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{it}{
       <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scit}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{scit}{
       <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scsl}{
-      <-> ssub * FiraSans-TLF/sb/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{scsl}{
+      <-> ssub * FiraSans-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sl}{
-      <-> ssub * FiraSans-TLF/sb/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{semibold}{sl}{
+      <-> ssub * FiraSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{sc}{
-      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{n}{
-      <-> \FiraSans@@scale FiraSans-Medium-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{it}{
-      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{scit}{
-      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{scsl}{
-      <-> ssub * FiraSans-TLF/mb/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{scsl}{
+      <-> ssub * FiraSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{sl}{
-      <-> ssub * FiraSans-TLF/mb/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{bold}{sl}{
+      <-> ssub * FiraSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ly1
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scit}{
-      <-> \FiraSans@@scale FiraSans-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
-      <-> ssub * FiraSans-TLF/m/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{scsl}{
+      <-> ssub * FiraSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sl}{
-      <-> ssub * FiraSans-TLF/m/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{light}{sl}{
+      <-> ssub * FiraSans-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sc}{
-      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-ly1
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{n}{
-      <-> \FiraSans@@scale FiraSans-Light-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{it}{
-      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scit}{
-      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scsl}{
-      <-> ssub * FiraSans-TLF/l/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{scsl}{
+      <-> ssub * FiraSans-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sl}{
-      <-> ssub * FiraSans-TLF/l/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{extrabold}{sl}{
+      <-> ssub * FiraSans-TLF/extrabold/it
+}{}
+
+
+%   ----  heavy  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{sc}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{scsl}{
+      <-> ssub * FiraSans-TLF/heavy/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{heavy}{sl}{
+      <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+
+%   ----  book  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{sc}{
       <-> \FiraSans@@scale FiraSans-Book-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{n}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{n}{
       <-> \FiraSans@@scale FiraSans-Book-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{it}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{it}{
       <-> \FiraSans@@scale FiraSans-BookItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{scit}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{scit}{
       <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{scsl}{
-      <-> ssub * FiraSans-TLF/sl/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{scsl}{
+      <-> ssub * FiraSans-TLF/book/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{sl}{sl}{
-      <-> ssub * FiraSans-TLF/sl/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{book}{sl}{
+      <-> ssub * FiraSans-TLF/book/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{sc}{
-      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{n}{
-      <-> \FiraSans@@scale FiraSans-Heavy-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{it}{
-      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{scit}{
-      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{scsl}{
-      <-> ssub * FiraSans-TLF/h/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{scsl}{
+      <-> ssub * FiraSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{h}{sl}{
-      <-> ssub * FiraSans-TLF/h/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{medium}{sl}{
+      <-> ssub * FiraSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sc}{
-      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-ly1
+
+%   ----  ultralight  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{n}{
-      <-> \FiraSans@@scale FiraSans-Bold-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{it}{
-      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scit}{
-      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scsl}{
-      <-> ssub * FiraSans-TLF/b/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{scsl}{
+      <-> ssub * FiraSans-TLF/ultralight/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sl}{
-      <-> ssub * FiraSans-TLF/b/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{ultralight}{sl}{
+      <-> ssub * FiraSans-TLF/ultralight/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{sc}{
       <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{n}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{n}{
       <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{it}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{it}{
       <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scit}{
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{scit}{
       <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scsl}{
-      <-> ssub * FiraSans-TLF/el/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{scsl}{
+      <-> ssub * FiraSans-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sl}{
-      <-> ssub * FiraSans-TLF/el/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{extralight}{sl}{
+      <-> ssub * FiraSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{sc}{
-      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{n}{
-      <-> \FiraSans@@scale FiraSans-Thin-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
+      <-> ssub * FiraSans-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{it}{
-      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
+      <-> ssub * FiraSans-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{scit}{
-      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
+      <-> ssub * FiraSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{scsl}{
-      <-> ssub * FiraSans-TLF/t/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
+      <-> ssub * FiraSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{t}{sl}{
-      <-> ssub * FiraSans-TLF/t/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scit}{
+      <-> ssub * FiraSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sl}{
-      <-> ssub * FiraSans-TLF/b/sl
+
+%   ul --> ultralight
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ultralight/sl
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{scsl}{
-      <-> ssub * FiraSans-TLF/b/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scsl}{
+      <-> ssub * FiraSans-TLF/ultralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sc}{
-      <-> ssub * FiraSans-TLF/b/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sc}{
+      <-> ssub * FiraSans-TLF/ultralight/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{n}{
+      <-> ssub * FiraSans-TLF/ultralight/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{it}{
+      <-> ssub * FiraSans-TLF/ultralight/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scit}{
+      <-> ssub * FiraSans-TLF/ultralight/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scsl}{
+      <-> ssub * FiraSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sc}{
+      <-> ssub * FiraSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{n}{
+      <-> ssub * FiraSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{it}{
+      <-> ssub * FiraSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scit}{
+      <-> ssub * FiraSans-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scsl}{
+      <-> ssub * FiraSans-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sc}{
+      <-> ssub * FiraSans-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{n}{
+      <-> ssub * FiraSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{it}{
+      <-> ssub * FiraSans-TLF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scit}{
+      <-> ssub * FiraSans-TLF/semibold/scit
+}{}
+
+
+%   ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sl}{
+      <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scsl}{
+      <-> ssub * FiraSans-TLF/heavy/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sc}{
+      <-> ssub * FiraSans-TLF/heavy/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{n}{
+      <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{it}{
+      <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scit}{
+      <-> ssub * FiraSans-TLF/heavy/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scsl}{
+      <-> ssub * FiraSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sc}{
+      <-> ssub * FiraSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{n}{
+      <-> ssub * FiraSans-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{it}{
+      <-> ssub * FiraSans-TLF/light/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scit}{
+      <-> ssub * FiraSans-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scsl}{
+      <-> ssub * FiraSans-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sc}{
+      <-> ssub * FiraSans-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{n}{
+      <-> ssub * FiraSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{it}{
+      <-> ssub * FiraSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scit}{
+      <-> ssub * FiraSans-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scsl}{
+      <-> ssub * FiraSans-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sc}{
+      <-> ssub * FiraSans-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{n}{
+      <-> ssub * FiraSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{it}{
+      <-> ssub * FiraSans-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scit}{
+      <-> ssub * FiraSans-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TLF}{bx}{n}{
       <-> ssub * FiraSans-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sc}{
+      <-> ssub * FiraSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{FiraSans-TLF}{bx}{it}{
       <-> ssub * FiraSans-TLF/b/it
 }{}