1 files changed, 380 insertions, 128 deletions

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