fira (10may15)

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

31 files changed, 622 insertions, 348 deletions

diff --git a/Master/texmf-dist/tex/latex/fira/FiraMono.sty b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
new file mode 100644
index 00000000000..b4f6e062720
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
@@ -0,0 +1,129 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{FiraMono}
+    [2015/05/09 (Bob Tennent and autoinst)  Style file for Fira Mono fonts.]
+
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
+\newif\iffiramono@otf 
+\ifxetex
+  \firamono@otftrue
+\else\ifluatex
+  \firamono@otftrue
+\else  % [pdf]LaTeX
+  \firamono@otffalse
+\fi\fi
+
+\newif\iffiramono@lining \firamono@liningfalse
+
+\newif\iffiramono@medium  \firamono@mediumfalse
+
+\newcommand*{\FiraMono@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\FiraSans@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\FiraSans@scale}{#1}}
+\DeclareOptionX{type1}{\firamono@otffalse}
+\DeclareOptionX{lining}{\firamono@liningtrue}
+\DeclareOptionX{lf}{\firamono@liningtrue}
+\DeclareOptionX{oldstyle}{\firamono@liningfalse}
+\DeclareOptionX{osf}{\firamono@liningfalse}
+
+\DeclareOptionX{medium}{\firamono@mediumtrue}
+\DeclareOptionX{mb}{\firamono@mediumtrue}
+
+\ProcessOptionsX
+
+\iffiramono@otf
+  \iffiramono@lining
+    \def\firamono@figurestyle{Lining}
+  \else
+    \def\firamono@figurestyle{OldStyle} 
+  \fi
+\else % type1
+  \iffiramono@lining
+    \def\firamono@figurestyle{LF}
+  \else
+    \def\firamono@figurestyle{OsF}
+  \fi
+\fi
+
+\iffiramono@otf
+  \def\firamono@boldstyle{Bold}
+  \def\firamono@regstyle{Regular}
+  \iffiramono@medium\def\firamono@regstyle{Medium}\fi
+
+\else % type1
+
+  \def\bfseries@tt{b}
+  \def\mdseries@tt{m}
+  \iffiramono@medium\def\mdseries@tt{mb}\fi
+\fi
+
+
+\iffiramono@otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,mweights,fontaxes}
+\fi
+
+\iffiramono@otf
+  \ifxetex\XeTeXtracingfonts=1\fi
+  \defaultfontfeatures{
+        Ligatures = TeX ,
+        Scale     = \FiraMono@scale ,
+        Extension = .otf }
+  \setmonofont
+      [ Numbers = {Monospaced,\firamono@figurestyle},
+        UprightFont    = *-\firamono@regstyle ,
+        ItalicFont     = *-\firamono@regstyle ,
+        BoldFont    = *-\firamono@boldstyle ,
+        BoldItalicFont     = *-\firamono@boldstyle ,
+      ]
+      {FiraMono}
+  % grab current family in case of subsequent change:
+  \let\firamonofamily\sfdefault  
+
+  \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+  \newfontfamily\firamonooldstyle
+      [ Numbers = {Monospaced,OldStyle},
+        UprightFont    = *-\firamono@regstyle ,
+        ItalicFont     = *-\firamono@regstyle ,
+        BoldFont    = *-\firamono@boldstyle ,
+        BoldItalicFont     = *-\firamono@boldstyle ,
+      ]
+      {FiraMono}
+  \newfontfamily\firamonolining
+      [ Numbers = {Monospaced,Lining},
+        UprightFont    = *-\firamono@regstyle ,
+        ItalicFont     = *-\firamono@regstyle ,
+        BoldFont    = *-\firamono@boldstyle ,
+        BoldItalicFont     = *-\firamono@boldstyle ,
+      ]
+      {FiraMono}
+  \newfontfamily\firamonomedium
+      [ Numbers = {Monospaced,\firamono@figurestyle},
+        UprightFont    = *-Medium ,
+        ItalicFont     = *-Medium ,
+        BoldFont    = *-\firamono@boldstyle ,
+        BoldItalicFont     = *-\firamono@boldstyle ,
+      ]
+      {FiraMono}
+
+\else % type1
+
+  \def\firamono@family{FiraMono-T\firamono@figurestyle}
+  \def\ttdefault{\firamono@family}
+  \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+  \def\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont}
+
+  \def\firamonooldstyle{\fontfamily{FiraMono-TOsF}\selectfont}
+  \def\firamonolining{\fontfamily{FiraMono-TLF}\selectfont}
+
+  \def\firamonomedium{\fontfamily{\firamono@family}\fontseries{mb}\selectfont}
+\fi
+
+
+\iffiramono@otf
+  \defaultfontfeatures{}
+\fi
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd
new file mode 100644
index 00000000000..3f41c890c56
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{LY1FiraMono-Sup.fd}
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraMono-Sup.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraMono-Sup}{}
+
+\DeclareFontShape{LY1}{FiraMono-Sup}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-Sup}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-Sup}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-Sup}{bx}{n}{
+      <-> ssub * FiraMono-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd
new file mode 100644
index 00000000000..36a6fae753b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{LY1FiraMono-TLF.fd}
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraMono-TLF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraMono-TLF}{}
+
+\DeclareFontShape{LY1}{FiraMono-TLF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TLF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TLF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TLF}{bx}{n}{
+      <-> ssub * FiraMono-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd
new file mode 100644
index 00000000000..be5be1ed111
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{LY1FiraMono-TOsF.fd}
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraMono-TOsF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{FiraMono-TOsF}{}
+
+\DeclareFontShape{LY1}{FiraMono-TOsF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TOsF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TOsF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{FiraMono-TOsF}{bx}{n}{
+      <-> ssub * FiraMono-TOsF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
index ef21e0efa30..6d544727973 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{LY1FiraSans-LF.fd}
-    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-LF.]
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-LF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-LF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-LF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-lf-ly1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-ly1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Italic-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-LF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
index e60020a59d4..e1288cedc5a 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{LY1FiraSans-OsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-OsF.]
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-OsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-OsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-OsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-osf-ly1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-ly1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Italic-osf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-OsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
index dd815980cf4..53e9d86a970 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{LY1FiraSans-Sup.fd}
-    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-Sup.]
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,20 +60,15 @@
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-Sup}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-sup-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-sup-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-sup-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-Sup}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-sup-ly1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-sup-ly1
+      <0-> \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
 }{}
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
index c9ea9538284..07b59f083e1 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{LY1FiraSans-TLF.fd}
-    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tlf-ly1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-ly1
+      <0-> \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}{scit}{
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Italic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
index a1bf75740ca..4e258b64c41 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{LY1FiraSans-TOsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for LY1/FiraSans-TOsF.]
+    [2015/05/08 (autoinst)  Font definitions for LY1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TOsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-ly1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-ly1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TOsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tosf-ly1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-ly1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-ly1
+      <0-> \FiraSans@@scale FiraSans-Italic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd
new file mode 100644
index 00000000000..583e033c903
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{OT1FiraMono-Sup.fd}
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraMono-Sup.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraMono-Sup}{}
+
+\DeclareFontShape{OT1}{FiraMono-Sup}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-Sup}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-Sup}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-Sup}{bx}{n}{
+      <-> ssub * FiraMono-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd
new file mode 100644
index 00000000000..6ecb72f2c0f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{OT1FiraMono-TLF.fd}
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraMono-TLF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraMono-TLF}{}
+
+\DeclareFontShape{OT1}{FiraMono-TLF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TLF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TLF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TLF}{bx}{n}{
+      <-> ssub * FiraMono-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd
new file mode 100644
index 00000000000..447739962b7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{OT1FiraMono-TOsF.fd}
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraMono-TOsF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{FiraMono-TOsF}{}
+
+\DeclareFontShape{OT1}{FiraMono-TOsF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TOsF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TOsF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{FiraMono-TOsF}{bx}{n}{
+      <-> ssub * FiraMono-TOsF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
index 2510b72cf1d..d1994382ca5 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{OT1FiraSans-LF.fd}
-    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-LF.]
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-LF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-LF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-LF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-lf-ot1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-ot1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Italic-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-LF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
index 1d853a96ffc..a86c5ef2ad6 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{OT1FiraSans-OsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-OsF.]
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-OsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-OsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-OsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-osf-ot1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-ot1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Italic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-OsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
index fd092c581ef..6b4633b1219 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{OT1FiraSans-Sup.fd}
-    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-Sup.]
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-Sup}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-sup-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-sup-ot1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-sup-ot1
+      <0-> \FiraSans@@scale FiraSans-Italic-sup-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-Sup}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
index 634054ae385..56ee5375564 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{OT1FiraSans-TLF.fd}
-    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-TLF.]
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TLF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TLF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TLF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tlf-ot1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-ot1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Italic-tlf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TLF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
index 02377b3103d..52760d45cb3 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{OT1FiraSans-TOsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for OT1/FiraSans-TOsF.]
+    [2015/05/08 (autoinst)  Font definitions for OT1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TOsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-ot1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-ot1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TOsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tosf-ot1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-ot1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-ot1
+      <0-> \FiraSans@@scale FiraSans-Italic-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd
new file mode 100644
index 00000000000..ce5e2260fb6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{T1FiraMono-Sup.fd}
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraMono-Sup.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraMono-Sup}{}
+
+\DeclareFontShape{T1}{FiraMono-Sup}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-Sup}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-Sup}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-Sup}{bx}{n}{
+      <-> ssub * FiraMono-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd
new file mode 100644
index 00000000000..311d8c6054b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{T1FiraMono-TLF.fd}
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraMono-TLF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraMono-TLF}{}
+
+\DeclareFontShape{T1}{FiraMono-TLF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TLF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TLF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TLF}{bx}{n}{
+      <-> ssub * FiraMono-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd
new file mode 100644
index 00000000000..77ea0940a58
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{T1FiraMono-TOsF.fd}
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraMono-TOsF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{FiraMono-TOsF}{}
+
+\DeclareFontShape{T1}{FiraMono-TOsF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TOsF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TOsF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{FiraMono-TOsF}{bx}{n}{
+      <-> ssub * FiraMono-TOsF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
index 2ece966ed24..0e092988cec 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{T1FiraSans-LF.fd}
-    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-LF.]
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{T1}{FiraSans-LF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-t1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-LF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-t1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-lf-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-LF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-lf-t1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-t1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Italic-lf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-LF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
index 79c3d69d0be..b76248c5170 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{T1FiraSans-OsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-OsF.]
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{T1}{FiraSans-OsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-t1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-OsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-t1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-osf-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-OsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-osf-t1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-t1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Italic-osf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-OsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
index 2f77c8fb5b3..c531caa11f1 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{T1FiraSans-Sup.fd}
-    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-Sup.]
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{T1}{FiraSans-Sup}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-sup-t1
+      <-0> \FiraSans@@scale FiraSans-Book-sup-t1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-sup-t1
+      <0-> \FiraSans@@scale FiraSans-Italic-sup-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-Sup}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
index abad9d1e203..e7d4e334dc9 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{T1FiraSans-TLF.fd}
-    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-TLF.]
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TLF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-t1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TLF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-t1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-tlf-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TLF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tlf-t1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-t1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Italic-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TLF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
index a1972f5f02c..d296c61493e 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{T1FiraSans-TOsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for T1/FiraSans-TOsF.]
+    [2015/05/08 (autoinst)  Font definitions for T1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -108,35 +108,23 @@
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TOsF}{m}{sc}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-t1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TOsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-t1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-t1
+      <0-> \FiraSans@@scale FiraSans-Regular-tosf-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TOsF}{m}{it}{
-      <-> \FiraSans@@scale FiraSans-Italic-tosf-t1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-t1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-t1
+      <0-> \FiraSans@@scale FiraSans-Italic-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{FiraSans-TOsF}{m}{scsl}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd
new file mode 100644
index 00000000000..a2feb01e85c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{TS1FiraMono-TLF.fd}
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraMono-TLF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraMono-TLF}{}
+
+\DeclareFontShape{TS1}{FiraMono-TLF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TLF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TLF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TLF}{bx}{n}{
+      <-> ssub * FiraMono-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd
new file mode 100644
index 00000000000..640d43f4ca8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2015/05/08
+%%
+\ProvidesFile{TS1FiraMono-TOsF.fd}
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraMono-TOsF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{FiraMono-TOsF}{}
+
+\DeclareFontShape{TS1}{FiraMono-TOsF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TOsF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TOsF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{FiraMono-TOsF}{bx}{n}{
+      <-> ssub * FiraMono-TOsF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
index d2d46fcd086..0703b150d82 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{TS1FiraSans-LF.fd}
-    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-LF.]
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-LF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-lf-ts1
+      <-0> \FiraSans@@scale FiraSans-Book-lf-ts1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-lf-ts1
+      <0-> \FiraSans@@scale FiraSans-Italic-lf-ts1
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-LF}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
index 6094930fe63..245475de9dc 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{TS1FiraSans-OsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-OsF.]
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-OsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-osf-ts1
+      <-0> \FiraSans@@scale FiraSans-Book-osf-ts1
+      <0-> \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}{k}{it}{
-      <-> \FiraSans@@scale FiraSans-BookItalic-osf-ts1
+      <-0> \FiraSans@@scale FiraSans-BookItalic-osf-ts1
+      <0-> \FiraSans@@scale FiraSans-Italic-osf-ts1
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-OsF}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
index 1ee8de2d387..b5d741ce125 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{TS1FiraSans-TLF.fd}
-    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-TLF.]
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-TLF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tlf-ts1
+      <-0> \FiraSans@@scale FiraSans-Book-tlf-ts1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tlf-ts1
+      <0-> \FiraSans@@scale FiraSans-Italic-tlf-ts1
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-TLF}{m}{sl}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
index f439d36e154..ddf7384faa0 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/11/19
+%% Generated by autoinst on 2015/05/08
 %%
 \ProvidesFile{TS1FiraSans-TOsF.fd}
-    [2014/11/19 (autoinst)  Font definitions for TS1/FiraSans-TOsF.]
+    [2015/05/08 (autoinst)  Font definitions for TS1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
@@ -60,19 +60,13 @@
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-TOsF}{m}{n}{
-      <-> \FiraSans@@scale FiraSans-Regular-tosf-ts1
+      <-0> \FiraSans@@scale FiraSans-Book-tosf-ts1
+      <0-> \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
+      <-0> \FiraSans@@scale FiraSans-BookItalic-tosf-ts1
+      <0-> \FiraSans@@scale FiraSans-Italic-tosf-ts1
 }{}
 
 \DeclareFontShape{TS1}{FiraSans-TOsF}{m}{sl}{