1 files changed, 380 insertions, 128 deletions

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