fira (20nov14)

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

39 files changed, 4714 insertions, 2145 deletions

diff --git a/Master/texmf-dist/tex/latex/fira/FiraSans.sty b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
index c793f3c00f7..6999a345803 100644
--- a/Master/texmf-dist/tex/latex/fira/FiraSans.sty
+++ b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{FiraSans}
-    [2014/03/16 (Bob Tennent and autoinst)  Style file for Fira Sans fonts.]
+    [2014/11/19 (Bob Tennent and autoinst)  Style file for Fira Sans fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -15,14 +15,22 @@
 
 \newif\iffira@lining \fira@liningfalse
 \newif\iffira@tabular \fira@tabularfalse
+
 \newif\iffira@medium  \fira@mediumfalse
+\newif\iffira@semibold  \fira@semiboldfalse
+\newif\iffira@extrabold  \fira@extraboldfalse
+\newif\iffira@heavy  \fira@heavyfalse
 \newif\iffira@light  \fira@lightfalse
+\newif\iffira@extralight  \fira@extralightfalse
+\newif\iffira@ultralight  \fira@ultralightfalse
+\newif\iffira@book  \fira@bookfalse
+\newif\iffira@thin  \fira@thinfalse
 \newif\iffira@default \fira@defaultfalse
 
-\newcommand*{\FiraSansOT@scale}{1}
+\newcommand*{\FiraSans@scale}{1}
 \RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\FiraSansOT@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\FiraSansOT@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\FiraSans@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\FiraSans@scale}{#1}}
 \DeclareOptionX{type1}{\fira@otffalse}
 \DeclareOptionX{lining}{\fira@liningtrue}
 \DeclareOptionX{lf}{\fira@liningtrue}
@@ -32,10 +40,19 @@
 \DeclareOptionX{t}{\fira@tabulartrue}
 \DeclareOptionX{proportional}{\fira@tabularfalse}
 \DeclareOptionX{p}{\fira@tabularfalse}
+
+\DeclareOptionX{book}{\fira@booktrue}
 \DeclareOptionX{medium}{\fira@mediumtrue}
 \DeclareOptionX{mb}{\fira@mediumtrue}
+\DeclareOptionX{semibold}{\fira@semiboldtrue}
+\DeclareOptionX{sb}{\fira@semiboldtrue}
 \DeclareOptionX{light}{\fira@lighttrue}
 \DeclareOptionX{l}{\fira@lighttrue}
+\DeclareOptionX{extralight}{\fira@extralighttrue}
+\DeclareOptionX{ultralight}{\fira@ultralighttrue}
+\DeclareOptionX{thin}{\fira@thintrue}
+\DeclareOptionX{extrabold}{\fira@extraboldtrue}
+\DeclareOptionX{heavy}{\fira@heavytrue}
 \DeclareOptionX{default}{\fira@defaulttrue}
 \DeclareOptionX{sfdefault}{\fira@defaulttrue}
 
@@ -68,16 +85,32 @@
 
 \iffira@otf
   \def\fira@boldstyle{Bold}
-  \iffira@medium\def\fira@boldstyle{Medium}\fi
+  \iffira@semibold\def\fira@boldstyle{SemiBold}\fi
+  \iffira@extrabold\def\fira@boldstyle{ExtraBold}\fi
+  \iffira@heavy\def\fira@boldstyle{Heavy}\fi
+
   \def\fira@regstyle{Regular}
+  \iffira@book\def\fira@regstyle{Book}\fi
+  \iffira@medium\def\fira@regstyle{Medium}\fi
   \iffira@light\def\fira@regstyle{Light}\fi
+  \iffira@extralight\def\fira@regstyle{ExtraLight}\fi
+  \iffira@ultralight\def\fira@regstyle{UltraLight}\fi
+  \iffira@thin\def\fira@regstyle{Thin}\fi
 
 \else % type1
 
   \def\bfseries@sf{b}
-  \iffira@medium\def\bfseries@sf{mb}\fi
+  \iffira@semibold\def\bfseries@sf{sb}\fi
+  \iffira@extrabold\def\bfseries@sf{eb}\fi
+  \iffira@heavy\def\bfseries@sf{h}\fi
+
   \def\mdseries@sf{m}
+  \iffira@book\def\mdseries@sf{k}\fi
+  \iffira@medium\def\mdseries@sf{mb}\fi
   \iffira@light\def\mdseries@sf{l}\fi
+  \iffira@extralight\def\mdseries@sf{el}\fi
+  \iffira@ultralight\def\mdseries@sf{ul}\fi
+  \iffira@thin\def\mdseries@sf{t}\fi
 \fi
 
 
@@ -91,7 +124,7 @@
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
-        Scale     = \FiraSansOT@scale ,
+        Scale     = \FiraSans@scale ,
         Extension = .otf }
   \setsansfont
       [ Numbers = {\fira@figurealign,\fira@figurestyle},
@@ -100,7 +133,7 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
-      {FiraSansOT}
+      {FiraSans}
   % grab current family in case of subsequent change:
   \let\firafamily\sfdefault  
   \iffira@default\renewcommand*\familydefault{\firafamily}\fi
@@ -113,7 +146,7 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
-      {FiraSansOT}
+      {FiraSans}
   \newfontfamily\firalining
       [ Numbers = {\fira@figurealign,Lining},
         UprightFont    = *-\fira@regstyle ,
@@ -121,7 +154,7 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
-      {FiraSansOT}
+      {FiraSans}
   \newfontfamily\firatabular
     [ Numbers = {Monospaced,\fira@figurestyle},
         UprightFont    = *-\fira@regstyle ,
@@ -129,7 +162,7 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
     ]
-    {FiraSansOT}
+    {FiraSans}
   \newfontfamily\firaproportional
     [ Numbers = {Proportional,\fira@figurestyle},
         UprightFont    = *-\fira@regstyle ,
@@ -137,7 +170,15 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
     ]
-    {FiraSansOT}
+    {FiraSans}
+  \newfontfamily\firathin
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-Thin ,
+        ItalicFont     = *-ThinItalic ,
+        BoldFont    = *-\fira@boldstyle ,
+        BoldItalicFont     = *-\fira@boldstyle Italic ,
+      ]
+      {FiraSans}
   \newfontfamily\firalight
       [ Numbers = {\fira@figurealign,\fira@figurestyle},
         UprightFont    = *-Light ,
@@ -145,7 +186,23 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
-      {FiraSansOT}
+      {FiraSans}
+  \newfontfamily\firaextralight
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-ExtraLight ,
+        ItalicFont     = *-ExtraLightItalic ,
+        BoldFont    = *-\fira@boldstyle ,
+        BoldItalicFont     = *-\fira@boldstyle Italic ,
+      ]
+      {FiraSans}
+  \newfontfamily\firaultralight
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-UltraLight ,
+        ItalicFont     = *-UltraLightItalic ,
+        BoldFont    = *-\fira@boldstyle ,
+        BoldItalicFont     = *-\fira@boldstyle Italic ,
+      ]
+      {FiraSans}
   \newfontfamily\firamedium
       [ Numbers = {\fira@figurealign,\fira@figurestyle},
         UprightFont    = *-Medium ,
@@ -153,11 +210,37 @@
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
-      {FiraSansOT}
+      {FiraSans}
+  \newfontfamily\firabook
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-Book ,
+        ItalicFont     = *-BookItalic ,
+        BoldFont    = *-\fira@boldstyle ,
+        BoldItalicFont     = *-\fira@boldstyle Italic ,
+      ]
+      {FiraSans}
+  \newfontfamily\firasemibold
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-SemiBold ,
+        ItalicFont     = *-SemiBoldItalic ,
+      ]
+      {FiraSans}
+  \newfontfamily\firaextrabold
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-ExtraBold ,
+        ItalicFont     = *-ExtraBoldItalic ,
+      ]
+      {FiraSans}
+  \newfontfamily\firaheavy
+      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+        UprightFont    = *-Heavy ,
+        ItalicFont     = *-HeavyItalic ,
+      ]
+      {FiraSans}
 
 \else % type1
 
-  \def\fira@family{FiraSansOT-\fira@figurealign\fira@figurestyle}
+  \def\fira@family{FiraSans-\fira@figurealign\fira@figurestyle}
   \renewcommand*\sfdefault{\fira@family}
   \iffira@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
 
@@ -165,13 +248,20 @@
   \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
   \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
 
-  \def\firaoldstyle{\fontfamily{FiraSansOT-\fira@figurealign OsF}\selectfont}
-  \def\firalining{\fontfamily{FiraSansOT-\fira@figurealign LF}\selectfont}
-  \def\firatabular{\fontfamily{FiraSansOT-T\fira@figurestyle}\selectfont}
-  \def\firaproportional{\fontfamily{FiraSansOT-\fira@figurestyle}\selectfont}
+  \def\firaoldstyle{\fontfamily{FiraSans-\fira@figurealign OsF}\selectfont}
+  \def\firalining{\fontfamily{FiraSans-\fira@figurealign LF}\selectfont}
+  \def\firatabular{\fontfamily{FiraSans-T\fira@figurestyle}\selectfont}
+  \def\firaproportional{\fontfamily{FiraSans-\fira@figurestyle}\selectfont}
 
+  \def\firathin{\fontfamily{\fira@family}\fontseries{t}\selectfont}
   \def\firalight{\fontfamily{\fira@family}\fontseries{l}\selectfont}
+  \def\firaextralight{\fontfamily{\fira@family}\fontseries{el}\selectfont}
+  \def\firaultralight{\fontfamily{\fira@family}\fontseries{ul}\selectfont}
   \def\firamedium{\fontfamily{\fira@family}\fontseries{mb}\selectfont}
+  \def\firabook{\fontfamily{\fira@family}\fontseries{k}\selectfont}
+  \def\firasemibold{\fontfamily{\fira@family}\fontseries{sb}\selectfont}
+  \def\firaextrabold{\fontfamily{\fira@family}\fontseries{eb}\selectfont}
+  \def\firaheavy{\fontfamily{\fira@family}\fontseries{h}\selectfont}
 
 \fi
 
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
new file mode 100644
index 00000000000..ef21e0efa30
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{LY1FiraSans-LF.fd}
+    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-LF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraSans-LF}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{scsl}{
+      <-> ssub * FiraSans-LF/ul/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ul}{sl}{
+      <-> ssub * FiraSans-LF/ul/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scsl}{
+      <-> ssub * FiraSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sl}{
+      <-> ssub * FiraSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scsl}{
+      <-> ssub * FiraSans-LF/sb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sl}{
+      <-> ssub * FiraSans-LF/sb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{scsl}{
+      <-> ssub * FiraSans-LF/mb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{mb}{sl}{
+      <-> ssub * FiraSans-LF/mb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{scsl}{
+      <-> ssub * FiraSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{sl}{
+      <-> ssub * FiraSans-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{scsl}{
+      <-> ssub * FiraSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{sl}{
+      <-> ssub * FiraSans-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{scsl}{
+      <-> ssub * FiraSans-LF/h/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{h}{sl}{
+      <-> ssub * FiraSans-LF/h/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{scsl}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{b}{sl}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{scsl}{
+      <-> ssub * FiraSans-LF/el/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{sl}{
+      <-> ssub * FiraSans-LF/el/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{scsl}{
+      <-> ssub * FiraSans-LF/t/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{t}{sl}{
+      <-> ssub * FiraSans-LF/t/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{sl}{
+      <-> ssub * FiraSans-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{scsl}{
+      <-> ssub * FiraSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{sc}{
+      <-> ssub * FiraSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{n}{
+      <-> ssub * FiraSans-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{it}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{bx}{scit}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
new file mode 100644
index 00000000000..e60020a59d4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{LY1FiraSans-OsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-OsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraSans-OsF}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{scsl}{
+      <-> ssub * FiraSans-OsF/ul/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{sl}{
+      <-> ssub * FiraSans-OsF/ul/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scsl}{
+      <-> ssub * FiraSans-OsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sl}{
+      <-> ssub * FiraSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scsl}{
+      <-> ssub * FiraSans-OsF/sb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sl}{
+      <-> ssub * FiraSans-OsF/sb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{scsl}{
+      <-> ssub * FiraSans-OsF/mb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{mb}{sl}{
+      <-> ssub * FiraSans-OsF/mb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scsl}{
+      <-> ssub * FiraSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sl}{
+      <-> ssub * FiraSans-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scsl}{
+      <-> ssub * FiraSans-OsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sl}{
+      <-> ssub * FiraSans-OsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{scsl}{
+      <-> ssub * FiraSans-OsF/h/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{h}{sl}{
+      <-> ssub * FiraSans-OsF/h/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{b}{sl}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scsl}{
+      <-> ssub * FiraSans-OsF/el/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sl}{
+      <-> ssub * FiraSans-OsF/el/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{scsl}{
+      <-> ssub * FiraSans-OsF/t/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{t}{sl}{
+      <-> ssub * FiraSans-OsF/t/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{sl}{
+      <-> ssub * FiraSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{sc}{
+      <-> ssub * FiraSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{n}{
+      <-> ssub * FiraSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{it}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{scit}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
new file mode 100644
index 00000000000..dd815980cf4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
@@ -0,0 +1,153 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{LY1FiraSans-Sup.fd}
+    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-Sup.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraSans-Sup}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ul}{sl}{
+      <-> ssub * FiraSans-Sup/ul/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{sl}{
+      <-> ssub * FiraSans-Sup/eb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{sl}{
+      <-> ssub * FiraSans-Sup/sb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{mb}{sl}{
+      <-> ssub * FiraSans-Sup/mb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-sup-ly1
+}{}
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{sl}{
+      <-> ssub * FiraSans-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{sl}{
+      <-> ssub * FiraSans-Sup/l/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{h}{sl}{
+      <-> ssub * FiraSans-Sup/h/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{b}{sl}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{sl}{
+      <-> ssub * FiraSans-Sup/el/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{t}{sl}{
+      <-> ssub * FiraSans-Sup/t/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{bx}{sl}{
+      <-> ssub * FiraSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{bx}{n}{
+      <-> ssub * FiraSans-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{bx}{it}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
new file mode 100644
index 00000000000..c9ea9538284
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{LY1FiraSans-TLF.fd}
+    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraSans-TLF}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{scsl}{
+      <-> ssub * FiraSans-TLF/ul/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ul/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scsl}{
+      <-> ssub * FiraSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scsl}{
+      <-> ssub * FiraSans-TLF/sb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/sb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{scsl}{
+      <-> ssub * FiraSans-TLF/mb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{mb}{sl}{
+      <-> ssub * FiraSans-TLF/mb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
+      <-> ssub * FiraSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scsl}{
+      <-> ssub * FiraSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{scsl}{
+      <-> ssub * FiraSans-TLF/h/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{h}{sl}{
+      <-> ssub * FiraSans-TLF/h/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scsl}{
+      <-> ssub * FiraSans-TLF/el/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/el/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{scsl}{
+      <-> ssub * FiraSans-TLF/t/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{t}{sl}{
+      <-> ssub * FiraSans-TLF/t/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{sc}{
+      <-> ssub * FiraSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{n}{
+      <-> ssub * FiraSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{it}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{scit}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
new file mode 100644
index 00000000000..a1bf75740ca
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{LY1FiraSans-TOsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-TOsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraSans-TOsF}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{scsl}{
+      <-> ssub * FiraSans-TOsF/ul/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{sl}{
+      <-> ssub * FiraSans-TOsF/ul/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scsl}{
+      <-> ssub * FiraSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sl}{
+      <-> ssub * FiraSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scsl}{
+      <-> ssub * FiraSans-TOsF/sb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sl}{
+      <-> ssub * FiraSans-TOsF/sb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{scsl}{
+      <-> ssub * FiraSans-TOsF/mb/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{mb}{sl}{
+      <-> ssub * FiraSans-TOsF/mb/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scsl}{
+      <-> ssub * FiraSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sl}{
+      <-> ssub * FiraSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scsl}{
+      <-> ssub * FiraSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sl}{
+      <-> ssub * FiraSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{scsl}{
+      <-> ssub * FiraSans-TOsF/h/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{h}{sl}{
+      <-> ssub * FiraSans-TOsF/h/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{b}{sl}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scsl}{
+      <-> ssub * FiraSans-TOsF/el/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sl}{
+      <-> ssub * FiraSans-TOsF/el/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{scsl}{
+      <-> ssub * FiraSans-TOsF/t/scit
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{t}{sl}{
+      <-> ssub * FiraSans-TOsF/t/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{sl}{
+      <-> ssub * FiraSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{sc}{
+      <-> ssub * FiraSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{n}{
+      <-> ssub * FiraSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{it}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{scit}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-LF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-LF.fd
deleted file mode 100644
index 7defa83cfc3..00000000000
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-LF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1FiraSansOT-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/FiraSansOT-LF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{FiraSansOT-LF}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{scsl}{
-      <-> ssub * FiraSansOT-LF/l/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{l}{sl}{
-      <-> ssub * FiraSansOT-LF/l/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{b}{sl}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-LF/mb/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{mb}{sl}{
-      <-> ssub * FiraSansOT-LF/mb/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{scsl}{
-      <-> ssub * FiraSansOT-LF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{m}{sl}{
-      <-> ssub * FiraSansOT-LF/m/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{sl}{
-      <-> ssub * FiraSansOT-LF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{sc}{
-      <-> ssub * FiraSansOT-LF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{n}{
-      <-> ssub * FiraSansOT-LF/b/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{it}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-LF}{bx}{scit}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-OsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-OsF.fd
deleted file mode 100644
index 751b0f429e2..00000000000
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-OsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1FiraSansOT-OsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/FiraSansOT-OsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{FiraSansOT-OsF}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-OsF/l/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{l}{sl}{
-      <-> ssub * FiraSansOT-OsF/l/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{b}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-OsF/mb/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-OsF/mb/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-OsF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{m}{sl}{
-      <-> ssub * FiraSansOT-OsF/m/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-OsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{n}{
-      <-> ssub * FiraSansOT-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{it}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-OsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-Sup.fd
deleted file mode 100644
index 8ed46ef56c3..00000000000
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-Sup.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1FiraSansOT-Sup.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/FiraSansOT-Sup.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{FiraSansOT-Sup}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{l}{sl}{
-      <-> ssub * FiraSansOT-Sup/l/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{b}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{mb}{sl}{
-      <-> ssub * FiraSansOT-Sup/mb/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{m}{sl}{
-      <-> ssub * FiraSansOT-Sup/m/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{bx}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{bx}{n}{
-      <-> ssub * FiraSansOT-Sup/b/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-Sup}{bx}{it}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TLF.fd
deleted file mode 100644
index 6c907473ed4..00000000000
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TLF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1FiraSansOT-TLF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/FiraSansOT-TLF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{FiraSansOT-TLF}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TLF/l/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{l}{sl}{
-      <-> ssub * FiraSansOT-TLF/l/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{b}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TLF/mb/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TLF/mb/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TLF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{m}{sl}{
-      <-> ssub * FiraSansOT-TLF/m/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TLF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{n}{
-      <-> ssub * FiraSansOT-TLF/b/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{it}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TLF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TOsF.fd
deleted file mode 100644
index 494361da282..00000000000
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSansOT-TOsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{LY1FiraSansOT-TOsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for LY1/FiraSansOT-TOsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{FiraSansOT-TOsF}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/l/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{l}{sl}{
-      <-> ssub * FiraSansOT-TOsF/l/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{b}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/mb/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TOsF/mb/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/m/scit
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{m}{sl}{
-      <-> ssub * FiraSansOT-TOsF/m/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TOsF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{n}{
-      <-> ssub * FiraSansOT-TOsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{it}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSansOT-TOsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
new file mode 100644
index 00000000000..2510b72cf1d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{OT1FiraSans-LF.fd}
+    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-LF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraSans-LF}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{scsl}{
+      <-> ssub * FiraSans-LF/ul/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ul}{sl}{
+      <-> ssub * FiraSans-LF/ul/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scsl}{
+      <-> ssub * FiraSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sl}{
+      <-> ssub * FiraSans-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scsl}{
+      <-> ssub * FiraSans-LF/sb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sl}{
+      <-> ssub * FiraSans-LF/sb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{scsl}{
+      <-> ssub * FiraSans-LF/mb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{mb}{sl}{
+      <-> ssub * FiraSans-LF/mb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{scsl}{
+      <-> ssub * FiraSans-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{sl}{
+      <-> ssub * FiraSans-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{scsl}{
+      <-> ssub * FiraSans-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{sl}{
+      <-> ssub * FiraSans-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{scsl}{
+      <-> ssub * FiraSans-LF/h/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{h}{sl}{
+      <-> ssub * FiraSans-LF/h/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{scsl}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{b}{sl}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{scsl}{
+      <-> ssub * FiraSans-LF/el/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{sl}{
+      <-> ssub * FiraSans-LF/el/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{scsl}{
+      <-> ssub * FiraSans-LF/t/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{t}{sl}{
+      <-> ssub * FiraSans-LF/t/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{sl}{
+      <-> ssub * FiraSans-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{scsl}{
+      <-> ssub * FiraSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{sc}{
+      <-> ssub * FiraSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{n}{
+      <-> ssub * FiraSans-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{it}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{bx}{scit}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
new file mode 100644
index 00000000000..1d853a96ffc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{OT1FiraSans-OsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-OsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraSans-OsF}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{scsl}{
+      <-> ssub * FiraSans-OsF/ul/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{sl}{
+      <-> ssub * FiraSans-OsF/ul/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scsl}{
+      <-> ssub * FiraSans-OsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sl}{
+      <-> ssub * FiraSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scsl}{
+      <-> ssub * FiraSans-OsF/sb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sl}{
+      <-> ssub * FiraSans-OsF/sb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{scsl}{
+      <-> ssub * FiraSans-OsF/mb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{mb}{sl}{
+      <-> ssub * FiraSans-OsF/mb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scsl}{
+      <-> ssub * FiraSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sl}{
+      <-> ssub * FiraSans-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scsl}{
+      <-> ssub * FiraSans-OsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sl}{
+      <-> ssub * FiraSans-OsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{scsl}{
+      <-> ssub * FiraSans-OsF/h/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{h}{sl}{
+      <-> ssub * FiraSans-OsF/h/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{b}{sl}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scsl}{
+      <-> ssub * FiraSans-OsF/el/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sl}{
+      <-> ssub * FiraSans-OsF/el/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{scsl}{
+      <-> ssub * FiraSans-OsF/t/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{t}{sl}{
+      <-> ssub * FiraSans-OsF/t/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{sl}{
+      <-> ssub * FiraSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{sc}{
+      <-> ssub * FiraSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{n}{
+      <-> ssub * FiraSans-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{it}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{scit}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
new file mode 100644
index 00000000000..fd092c581ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{OT1FiraSans-Sup.fd}
+    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-Sup.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraSans-Sup}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ul}{sl}{
+      <-> ssub * FiraSans-Sup/ul/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{sl}{
+      <-> ssub * FiraSans-Sup/eb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{sl}{
+      <-> ssub * FiraSans-Sup/sb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{mb}{sl}{
+      <-> ssub * FiraSans-Sup/mb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{sl}{
+      <-> ssub * FiraSans-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{sl}{
+      <-> ssub * FiraSans-Sup/l/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{h}{sl}{
+      <-> ssub * FiraSans-Sup/h/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{b}{sl}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{sl}{
+      <-> ssub * FiraSans-Sup/el/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{t}{sl}{
+      <-> ssub * FiraSans-Sup/t/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{bx}{sl}{
+      <-> ssub * FiraSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{bx}{n}{
+      <-> ssub * FiraSans-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{bx}{it}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
new file mode 100644
index 00000000000..634054ae385
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{OT1FiraSans-TLF.fd}
+    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-TLF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraSans-TLF}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{scsl}{
+      <-> ssub * FiraSans-TLF/ul/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ul/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scsl}{
+      <-> ssub * FiraSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scsl}{
+      <-> ssub * FiraSans-TLF/sb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/sb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{scsl}{
+      <-> ssub * FiraSans-TLF/mb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{mb}{sl}{
+      <-> ssub * FiraSans-TLF/mb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scsl}{
+      <-> ssub * FiraSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scsl}{
+      <-> ssub * FiraSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{scsl}{
+      <-> ssub * FiraSans-TLF/h/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{h}{sl}{
+      <-> ssub * FiraSans-TLF/h/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scsl}{
+      <-> ssub * FiraSans-TLF/el/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/el/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{scsl}{
+      <-> ssub * FiraSans-TLF/t/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{t}{sl}{
+      <-> ssub * FiraSans-TLF/t/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{sc}{
+      <-> ssub * FiraSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{n}{
+      <-> ssub * FiraSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{it}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{scit}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
new file mode 100644
index 00000000000..02377b3103d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{OT1FiraSans-TOsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-TOsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraSans-TOsF}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{scsl}{
+      <-> ssub * FiraSans-TOsF/ul/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{sl}{
+      <-> ssub * FiraSans-TOsF/ul/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scsl}{
+      <-> ssub * FiraSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sl}{
+      <-> ssub * FiraSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scsl}{
+      <-> ssub * FiraSans-TOsF/sb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sl}{
+      <-> ssub * FiraSans-TOsF/sb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{scsl}{
+      <-> ssub * FiraSans-TOsF/mb/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{mb}{sl}{
+      <-> ssub * FiraSans-TOsF/mb/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scsl}{
+      <-> ssub * FiraSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sl}{
+      <-> ssub * FiraSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scsl}{
+      <-> ssub * FiraSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sl}{
+      <-> ssub * FiraSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{scsl}{
+      <-> ssub * FiraSans-TOsF/h/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{h}{sl}{
+      <-> ssub * FiraSans-TOsF/h/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{b}{sl}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scsl}{
+      <-> ssub * FiraSans-TOsF/el/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sl}{
+      <-> ssub * FiraSans-TOsF/el/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{scsl}{
+      <-> ssub * FiraSans-TOsF/t/scit
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{t}{sl}{
+      <-> ssub * FiraSans-TOsF/t/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{sl}{
+      <-> ssub * FiraSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{sc}{
+      <-> ssub * FiraSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{n}{
+      <-> ssub * FiraSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{it}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{scit}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-LF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-LF.fd
deleted file mode 100644
index b0e187d97a7..00000000000
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-LF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1FiraSansOT-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/FiraSansOT-LF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{FiraSansOT-LF}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{scsl}{
-      <-> ssub * FiraSansOT-LF/l/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{l}{sl}{
-      <-> ssub * FiraSansOT-LF/l/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{b}{sl}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-LF/mb/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{mb}{sl}{
-      <-> ssub * FiraSansOT-LF/mb/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{scsl}{
-      <-> ssub * FiraSansOT-LF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{m}{sl}{
-      <-> ssub * FiraSansOT-LF/m/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{sl}{
-      <-> ssub * FiraSansOT-LF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{sc}{
-      <-> ssub * FiraSansOT-LF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{n}{
-      <-> ssub * FiraSansOT-LF/b/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{it}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-LF}{bx}{scit}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-OsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-OsF.fd
deleted file mode 100644
index 11c0e4163a5..00000000000
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-OsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1FiraSansOT-OsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/FiraSansOT-OsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{FiraSansOT-OsF}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-OsF/l/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{l}{sl}{
-      <-> ssub * FiraSansOT-OsF/l/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{b}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-OsF/mb/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-OsF/mb/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-OsF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{m}{sl}{
-      <-> ssub * FiraSansOT-OsF/m/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-OsF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{n}{
-      <-> ssub * FiraSansOT-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{it}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-OsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-Sup.fd
deleted file mode 100644
index 919732e8397..00000000000
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-Sup.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1FiraSansOT-Sup.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/FiraSansOT-Sup.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{FiraSansOT-Sup}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{l}{sl}{
-      <-> ssub * FiraSansOT-Sup/l/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{b}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{mb}{sl}{
-      <-> ssub * FiraSansOT-Sup/mb/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{m}{sl}{
-      <-> ssub * FiraSansOT-Sup/m/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{bx}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{bx}{n}{
-      <-> ssub * FiraSansOT-Sup/b/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-Sup}{bx}{it}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TLF.fd
deleted file mode 100644
index de9c74aaf17..00000000000
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TLF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1FiraSansOT-TLF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/FiraSansOT-TLF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{FiraSansOT-TLF}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TLF/l/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{l}{sl}{
-      <-> ssub * FiraSansOT-TLF/l/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{b}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TLF/mb/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TLF/mb/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TLF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{m}{sl}{
-      <-> ssub * FiraSansOT-TLF/m/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TLF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{n}{
-      <-> ssub * FiraSansOT-TLF/b/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{it}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TLF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TOsF.fd
deleted file mode 100644
index bc2a533345c..00000000000
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSansOT-TOsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{OT1FiraSansOT-TOsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for OT1/FiraSansOT-TOsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{FiraSansOT-TOsF}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/l/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{l}{sl}{
-      <-> ssub * FiraSansOT-TOsF/l/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{b}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/mb/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TOsF/mb/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{m}{sl}{
-      <-> ssub * FiraSansOT-TOsF/m/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TOsF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{n}{
-      <-> ssub * FiraSansOT-TOsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{it}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSansOT-TOsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
new file mode 100644
index 00000000000..2ece966ed24
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{T1FiraSans-LF.fd}
+    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-LF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraSans-LF}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{scsl}{
+      <-> ssub * FiraSans-LF/ul/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ul}{sl}{
+      <-> ssub * FiraSans-LF/ul/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{scsl}{
+      <-> ssub * FiraSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{sl}{
+      <-> ssub * FiraSans-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{scsl}{
+      <-> ssub * FiraSans-LF/sb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{sl}{
+      <-> ssub * FiraSans-LF/sb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{scsl}{
+      <-> ssub * FiraSans-LF/mb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{mb}{sl}{
+      <-> ssub * FiraSans-LF/mb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{scsl}{
+      <-> ssub * FiraSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{m}{sl}{
+      <-> ssub * FiraSans-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{scsl}{
+      <-> ssub * FiraSans-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{l}{sl}{
+      <-> ssub * FiraSans-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{scsl}{
+      <-> ssub * FiraSans-LF/h/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{h}{sl}{
+      <-> ssub * FiraSans-LF/h/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{scsl}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{b}{sl}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{scsl}{
+      <-> ssub * FiraSans-LF/el/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{el}{sl}{
+      <-> ssub * FiraSans-LF/el/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{scsl}{
+      <-> ssub * FiraSans-LF/t/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{t}{sl}{
+      <-> ssub * FiraSans-LF/t/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{sl}{
+      <-> ssub * FiraSans-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{scsl}{
+      <-> ssub * FiraSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{sc}{
+      <-> ssub * FiraSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{n}{
+      <-> ssub * FiraSans-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{it}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{bx}{scit}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
new file mode 100644
index 00000000000..79c3d69d0be
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{T1FiraSans-OsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-OsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraSans-OsF}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{scsl}{
+      <-> ssub * FiraSans-OsF/ul/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ul}{sl}{
+      <-> ssub * FiraSans-OsF/ul/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scsl}{
+      <-> ssub * FiraSans-OsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sl}{
+      <-> ssub * FiraSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scsl}{
+      <-> ssub * FiraSans-OsF/sb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sl}{
+      <-> ssub * FiraSans-OsF/sb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{scsl}{
+      <-> ssub * FiraSans-OsF/mb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{mb}{sl}{
+      <-> ssub * FiraSans-OsF/mb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{scsl}{
+      <-> ssub * FiraSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{sl}{
+      <-> ssub * FiraSans-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{scsl}{
+      <-> ssub * FiraSans-OsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{sl}{
+      <-> ssub * FiraSans-OsF/l/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{scsl}{
+      <-> ssub * FiraSans-OsF/h/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{h}{sl}{
+      <-> ssub * FiraSans-OsF/h/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{b}{sl}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{scsl}{
+      <-> ssub * FiraSans-OsF/el/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{sl}{
+      <-> ssub * FiraSans-OsF/el/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{scsl}{
+      <-> ssub * FiraSans-OsF/t/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{t}{sl}{
+      <-> ssub * FiraSans-OsF/t/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{sl}{
+      <-> ssub * FiraSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{sc}{
+      <-> ssub * FiraSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{n}{
+      <-> ssub * FiraSans-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{it}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{bx}{scit}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
new file mode 100644
index 00000000000..2f77c8fb5b3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{T1FiraSans-Sup.fd}
+    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-Sup.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraSans-Sup}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ul}{sl}{
+      <-> ssub * FiraSans-Sup/ul/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{sl}{
+      <-> ssub * FiraSans-Sup/eb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{sl}{
+      <-> ssub * FiraSans-Sup/sb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{mb}{sl}{
+      <-> ssub * FiraSans-Sup/mb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{sl}{
+      <-> ssub * FiraSans-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{sl}{
+      <-> ssub * FiraSans-Sup/l/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{h}{sl}{
+      <-> ssub * FiraSans-Sup/h/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{b}{sl}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{sl}{
+      <-> ssub * FiraSans-Sup/el/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{t}{sl}{
+      <-> ssub * FiraSans-Sup/t/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{bx}{sl}{
+      <-> ssub * FiraSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{bx}{n}{
+      <-> ssub * FiraSans-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{bx}{it}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
new file mode 100644
index 00000000000..abad9d1e203
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{T1FiraSans-TLF.fd}
+    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-TLF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraSans-TLF}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{scsl}{
+      <-> ssub * FiraSans-TLF/ul/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ul/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scsl}{
+      <-> ssub * FiraSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scsl}{
+      <-> ssub * FiraSans-TLF/sb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/sb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{scsl}{
+      <-> ssub * FiraSans-TLF/mb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{mb}{sl}{
+      <-> ssub * FiraSans-TLF/mb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{scsl}{
+      <-> ssub * FiraSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{scsl}{
+      <-> ssub * FiraSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{scsl}{
+      <-> ssub * FiraSans-TLF/h/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{h}{sl}{
+      <-> ssub * FiraSans-TLF/h/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{scsl}{
+      <-> ssub * FiraSans-TLF/el/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/el/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{scsl}{
+      <-> ssub * FiraSans-TLF/t/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{t}{sl}{
+      <-> ssub * FiraSans-TLF/t/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{sc}{
+      <-> ssub * FiraSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{n}{
+      <-> ssub * FiraSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{it}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{bx}{scit}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
new file mode 100644
index 00000000000..a1972f5f02c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
@@ -0,0 +1,294 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{T1FiraSans-TOsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-TOsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraSans-TOsF}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{scsl}{
+      <-> ssub * FiraSans-TOsF/ul/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{sl}{
+      <-> ssub * FiraSans-TOsF/ul/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scsl}{
+      <-> ssub * FiraSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sl}{
+      <-> ssub * FiraSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scsl}{
+      <-> ssub * FiraSans-TOsF/sb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sl}{
+      <-> ssub * FiraSans-TOsF/sb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{scsl}{
+      <-> ssub * FiraSans-TOsF/mb/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{mb}{sl}{
+      <-> ssub * FiraSans-TOsF/mb/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{k}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{k}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scsl}{
+      <-> ssub * FiraSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sl}{
+      <-> ssub * FiraSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scsl}{
+      <-> ssub * FiraSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sl}{
+      <-> ssub * FiraSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{scsl}{
+      <-> ssub * FiraSans-TOsF/h/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{h}{sl}{
+      <-> ssub * FiraSans-TOsF/h/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{b}{sl}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scsl}{
+      <-> ssub * FiraSans-TOsF/el/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sl}{
+      <-> ssub * FiraSans-TOsF/el/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{scsl}{
+      <-> ssub * FiraSans-TOsF/t/scit
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{t}{sl}{
+      <-> ssub * FiraSans-TOsF/t/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{sl}{
+      <-> ssub * FiraSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{sc}{
+      <-> ssub * FiraSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{n}{
+      <-> ssub * FiraSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{it}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{scit}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-LF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-LF.fd
deleted file mode 100644
index 076f42d1f19..00000000000
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-LF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1FiraSansOT-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/FiraSansOT-LF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{FiraSansOT-LF}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{scsl}{
-      <-> ssub * FiraSansOT-LF/l/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{l}{sl}{
-      <-> ssub * FiraSansOT-LF/l/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{b}{sl}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-LF/mb/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{mb}{sl}{
-      <-> ssub * FiraSansOT-LF/mb/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{scsl}{
-      <-> ssub * FiraSansOT-LF/m/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{m}{sl}{
-      <-> ssub * FiraSansOT-LF/m/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{sl}{
-      <-> ssub * FiraSansOT-LF/b/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-LF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{sc}{
-      <-> ssub * FiraSansOT-LF/b/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{n}{
-      <-> ssub * FiraSansOT-LF/b/n
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{it}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-LF}{bx}{scit}{
-      <-> ssub * FiraSansOT-LF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-OsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-OsF.fd
deleted file mode 100644
index 0ea7e62316a..00000000000
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-OsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1FiraSansOT-OsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/FiraSansOT-OsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{FiraSansOT-OsF}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-OsF/l/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{l}{sl}{
-      <-> ssub * FiraSansOT-OsF/l/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{b}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-OsF/mb/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-OsF/mb/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-OsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{m}{sl}{
-      <-> ssub * FiraSansOT-OsF/m/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-OsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-OsF/b/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{n}{
-      <-> ssub * FiraSansOT-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{it}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-OsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-OsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-Sup.fd
deleted file mode 100644
index 909576bf7f2..00000000000
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-Sup.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1FiraSansOT-Sup.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/FiraSansOT-Sup.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{FiraSansOT-Sup}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{l}{sl}{
-      <-> ssub * FiraSansOT-Sup/l/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{b}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{mb}{sl}{
-      <-> ssub * FiraSansOT-Sup/mb/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{m}{sl}{
-      <-> ssub * FiraSansOT-Sup/m/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{bx}{sl}{
-      <-> ssub * FiraSansOT-Sup/b/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{bx}{n}{
-      <-> ssub * FiraSansOT-Sup/b/n
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-Sup}{bx}{it}{
-      <-> ssub * FiraSansOT-Sup/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TLF.fd
deleted file mode 100644
index f519019baf1..00000000000
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TLF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1FiraSansOT-TLF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/FiraSansOT-TLF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{FiraSansOT-TLF}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TLF/l/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{l}{sl}{
-      <-> ssub * FiraSansOT-TLF/l/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{b}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TLF/mb/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TLF/mb/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TLF/m/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{m}{sl}{
-      <-> ssub * FiraSansOT-TLF/m/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TLF/b/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{n}{
-      <-> ssub * FiraSansOT-TLF/b/n
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{it}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TLF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TOsF.fd
deleted file mode 100644
index 53b29a2543a..00000000000
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSansOT-TOsF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{T1FiraSansOT-TOsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for T1/FiraSansOT-TOsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{FiraSansOT-TOsF}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/l/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{l}{sl}{
-      <-> ssub * FiraSansOT-TOsF/l/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{b}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/mb/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TOsF/mb/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{sc}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{scit}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{m}{sl}{
-      <-> ssub * FiraSansOT-TOsF/m/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{scsl}{
-      <-> ssub * FiraSansOT-TOsF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{sc}{
-      <-> ssub * FiraSansOT-TOsF/b/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{n}{
-      <-> ssub * FiraSansOT-TOsF/b/n
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{it}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{T1}{FiraSansOT-TOsF}{bx}{scit}{
-      <-> ssub * FiraSansOT-TOsF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
new file mode 100644
index 00000000000..d2d46fcd086
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{TS1FiraSans-LF.fd}
+    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-LF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraSans-LF}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ul}{sl}{
+      <-> ssub * FiraSans-LF/ul/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{sl}{
+      <-> ssub * FiraSans-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{sl}{
+      <-> ssub * FiraSans-LF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{mb}{sl}{
+      <-> ssub * FiraSans-LF/mb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{sl}{
+      <-> ssub * FiraSans-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{sl}{
+      <-> ssub * FiraSans-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{h}{sl}{
+      <-> ssub * FiraSans-LF/h/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{b}{sl}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{sl}{
+      <-> ssub * FiraSans-LF/el/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{t}{sl}{
+      <-> ssub * FiraSans-LF/t/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{bx}{sl}{
+      <-> ssub * FiraSans-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{bx}{n}{
+      <-> ssub * FiraSans-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{bx}{it}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
new file mode 100644
index 00000000000..87fc373381e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{TS1FiraSans-OsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-OsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraSans-OsF}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ul}{sl}{
+      <-> ssub * FiraSans-OsF/ul/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{sl}{
+      <-> ssub * FiraSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{sl}{
+      <-> ssub * FiraSans-OsF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{mb}{sl}{
+      <-> ssub * FiraSans-OsF/mb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{mk{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{sl}{
+      <-> ssub * FiraSans-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{sl}{
+      <-> ssub * FiraSans-OsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{h}{sl}{
+      <-> ssub * FiraSans-OsF/h/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{b}{sl}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{sl}{
+      <-> ssub * FiraSans-OsF/el/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{t}{sl}{
+      <-> ssub * FiraSans-OsF/t/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{bx}{sl}{
+      <-> ssub * FiraSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{bx}{n}{
+      <-> ssub * FiraSans-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{bx}{it}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
new file mode 100644
index 00000000000..1ee8de2d387
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{TS1FiraSans-TLF.fd}
+    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-TLF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraSans-TLF}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ul/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{mb}{sl}{
+      <-> ssub * FiraSans-TLF/mb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{h}{sl}{
+      <-> ssub * FiraSans-TLF/h/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/el/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{t}{sl}{
+      <-> ssub * FiraSans-TLF/t/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{bx}{n}{
+      <-> ssub * FiraSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{bx}{it}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
new file mode 100644
index 00000000000..f439d36e154
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
@@ -0,0 +1,154 @@
+%% Generated by autoinst on 2014/11/19
+%%
+\ProvidesFile{TS1FiraSans-TOsF.fd}
+    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-TOsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraSans-TOsF}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ul}{sl}{
+      <-> ssub * FiraSans-TOsF/ul/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{sl}{
+      <-> ssub * FiraSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{sl}{
+      <-> ssub * FiraSans-TOsF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{mb}{sl}{
+      <-> ssub * FiraSans-TOsF/mb/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{k}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{k}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{sl}{
+      <-> ssub * FiraSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{sl}{
+      <-> ssub * FiraSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{h}{sl}{
+      <-> ssub * FiraSans-TOsF/h/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{b}{sl}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{sl}{
+      <-> ssub * FiraSans-TOsF/el/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{t}{sl}{
+      <-> ssub * FiraSans-TOsF/t/it
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{bx}{sl}{
+      <-> ssub * FiraSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{bx}{n}{
+      <-> ssub * FiraSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{bx}{it}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-LF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-LF.fd
deleted file mode 100644
index bdd62ebbdac..00000000000
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-LF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1FiraSansOT-LF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/FiraSansOT-LF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{FiraSansOT-LF}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{l}{sl}{
-      <-> ssub * FiraSansOT-LF/l/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{b}{sl}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{mb}{sl}{
-      <-> ssub * FiraSansOT-LF/mb/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{m}{sl}{
-      <-> ssub * FiraSansOT-LF/m/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{bx}{sl}{
-      <-> ssub * FiraSansOT-LF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{bx}{n}{
-      <-> ssub * FiraSansOT-LF/b/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-LF}{bx}{it}{
-      <-> ssub * FiraSansOT-LF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-OsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-OsF.fd
deleted file mode 100644
index 592231fa6f4..00000000000
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-OsF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1FiraSansOT-OsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/FiraSansOT-OsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{FiraSansOT-OsF}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{l}{sl}{
-      <-> ssub * FiraSansOT-OsF/l/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{b}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-OsF/mb/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{m}{sl}{
-      <-> ssub * FiraSansOT-OsF/m/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{bx}{n}{
-      <-> ssub * FiraSansOT-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-OsF}{bx}{it}{
-      <-> ssub * FiraSansOT-OsF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TLF.fd
deleted file mode 100644
index e29fa956801..00000000000
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1FiraSansOT-TLF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/FiraSansOT-TLF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{FiraSansOT-TLF}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{l}{sl}{
-      <-> ssub * FiraSansOT-TLF/l/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{b}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TLF/mb/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{m}{sl}{
-      <-> ssub * FiraSansOT-TLF/m/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TLF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{bx}{n}{
-      <-> ssub * FiraSansOT-TLF/b/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TLF}{bx}{it}{
-      <-> ssub * FiraSansOT-TLF/b/it
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TOsF.fd
deleted file mode 100644
index a74355e4cde..00000000000
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSansOT-TOsF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% Generated by autoinst on 2014/03/14
-%%
-\ProvidesFile{TS1FiraSansOT-TOsF.fd}
-    [2014/03/14 (autoinst)  Font definitions for TS1/FiraSansOT-TOsF.]
-
-\expandafter\ifx\csname FiraSansOT@scale\endcsname\relax
-    \let\FiraSansOT@@scale\@empty
-\else
-    \edef\FiraSansOT@@scale{s*[\csname FiraSansOT@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{FiraSansOT-TOsF}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{l}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{l}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTLight-Italic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{l}{sl}{
-      <-> ssub * FiraSansOT-TOsF/l/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{b}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-Bold-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{b}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-BoldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{b}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{mb}{n}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{mb}{it}{
-      <-> \FiraSansOT@@scale FiraSansOTMedium-Italic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{mb}{sl}{
-      <-> ssub * FiraSansOT-TOsF/mb/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{m}{n}{
-      <-> \FiraSansOT@@scale FiraSansOT-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{m}{it}{
-      <-> \FiraSansOT@@scale FiraSansOT-Italic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{m}{sl}{
-      <-> ssub * FiraSansOT-TOsF/m/it
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{bx}{sl}{
-      <-> ssub * FiraSansOT-TOsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{bx}{n}{
-      <-> ssub * FiraSansOT-TOsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSansOT-TOsF}{bx}{it}{
-      <-> ssub * FiraSansOT-TOsF/b/it
-}{}
-
-\endinput