fira (24may18)

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

40 files changed, 1570 insertions, 108 deletions

diff --git a/Master/texmf-dist/tex/latex/fira/FiraMono.sty b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
index 5e84450d008..0fa8688ac4c 100644
--- a/Master/texmf-dist/tex/latex/fira/FiraMono.sty
+++ b/Master/texmf-dist/tex/latex/fira/FiraMono.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{FiraMono}
-    [2016/02/13 (Bob Tennent and autoinst)  Style file for Fira Mono fonts.]
+    [2018/05/23 (Bob Tennent and autoinst)  Style file for Fira Mono fonts.]
 
 % nomap option suggested by Harlan Lieberman-Berg (hlieberm@akamai.com) 2016-02-11
 
@@ -38,18 +38,18 @@
 
 \iffiramono@otf
   \iffiramono@lining
-    \def\firamono@figurestyle{Lining}
+    \def\firamono@otffigurestyle{Tabular}
   \else
-    \def\firamono@figurestyle{OldStyle} 
-  \fi
-\else % type1
-  \iffiramono@lining
-    \def\firamono@figurestyle{LF}
-  \else
-    \def\firamono@figurestyle{OsF}
+    \def\firamono@otffigurestyle{OldStyle} 
   \fi
 \fi
 
+\iffiramono@lining
+  \def\firamono@figurestyle{LF}
+\else
+  \def\firamono@figurestyle{OsF}
+\fi
+
 \iffiramono@otf
   \def\firamono@boldstyle{Bold}
   \def\firamono@regstyle{Regular}
@@ -82,7 +82,7 @@
           Extension = .otf }
   \fi
   \setmonofont
-      [ Numbers = {Monospaced,\firamono@figurestyle},
+      [ Numbers = {Monospaced,\firamono@otffigurestyle},
         UprightFont    = *-\firamono@regstyle ,
         ItalicFont     = *-\firamono@regstyle ,
         BoldFont    = *-\firamono@boldstyle ,
@@ -102,7 +102,7 @@
       ]
       {FiraMono}
   \newfontfamily\firamonolining
-      [ Numbers = {Monospaced,Lining},
+      [ Numbers = {Monospaced,Tabular},
         UprightFont    = *-\firamono@regstyle ,
         ItalicFont     = *-\firamono@regstyle ,
         BoldFont    = *-\firamono@boldstyle ,
@@ -110,7 +110,7 @@
       ]
       {FiraMono}
   \newfontfamily\firamonomedium
-      [ Numbers = {Monospaced,\firamono@figurestyle},
+      [ Numbers = {Monospaced,\firamono@otffigurestyle},
         UprightFont    = *-Medium ,
         ItalicFont     = *-Medium ,
         BoldFont    = *-\firamono@boldstyle ,
@@ -131,6 +131,8 @@
   \def\firamonomedium{\fontfamily{\firamono@family}\fontseries{mb}\selectfont}
 \fi
 
+%  Use FiraSans-... as the family, even for otf
+\def\firmonoalgr{\fontencoding{LGR}\fontfamily{FiraMono-T\fira@figurestyle}\selectfont}
 
 \iffiramono@otf
   \defaultfontfeatures{}
diff --git a/Master/texmf-dist/tex/latex/fira/FiraSans.sty b/Master/texmf-dist/tex/latex/fira/FiraSans.sty
index 9d8c84ca8dc..1eeb7f7ee98 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}
-    [2018/01/09 (Bob Tennent and autoinst)  Style file for Fira Sans fonts.]
+    [2018/05/23 (Bob Tennent and autoinst)  Style file for Fira Sans fonts.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -61,28 +61,28 @@
 
 \iffira@otf
   \iffira@lining
-    \def\fira@figurestyle{Lining}
+    \def\fira@otffigurestyle{Lining}
   \else
-    \def\fira@figurestyle{OldStyle} 
+    \def\fira@otffigurestyle{OldStyle} 
   \fi
   \iffira@tabular
-    \def\fira@figurealign{Monospaced} 
+    \def\fira@otffigurealign{Monospaced} 
   \else
-    \def\fira@figurealign{Proportional} 
-  \fi
-\else % type1
-  \iffira@lining
-    \def\fira@figurestyle{LF}
-  \else
-    \def\fira@figurestyle{OsF}
-  \fi
-  \iffira@tabular
-    \def\fira@figurealign{T}
-  \else
-    \def\fira@figurealign{}
+    \def\fira@otffigurealign{Proportional} 
   \fi
 \fi
 
+\iffira@lining
+  \def\fira@figurestyle{LF}
+\else
+  \def\fira@figurestyle{OsF}
+\fi
+\iffira@tabular
+  \def\fira@figurealign{T}
+\else
+  \def\fira@figurealign{}
+\fi
+
 \iffira@otf
   \def\fira@boldstyle{Bold}
   \iffira@semibold\def\fira@boldstyle{SemiBold}\fi
@@ -117,19 +117,20 @@
 \iffira@otf
   \RequirePackage{fontspec}
 \else
-  \RequirePackage{fontenc,mweights,fontaxes}
+  \RequirePackage{mweights,fontaxes}
 \fi
 
 \iffira@otf
+  \def\fira@regular{Regular}
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \FiraSans@scale ,
         Extension = .otf }
   \setsansfont
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-\fira@regstyle ,
-        ItalicFont     = *-\fira@regstyle Italic ,
+        ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
@@ -140,39 +141,39 @@
 
   \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}}
   \newfontfamily\firaoldstyle
-      [ Numbers = {\fira@figurealign,OldStyle},
+      [ Numbers = {\fira@otffigurealign,OldStyle},
         UprightFont    = *-\fira@regstyle ,
-        ItalicFont     = *-\fira@regstyle Italic ,
+        ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
       {FiraSans}
   \newfontfamily\firalining
-      [ Numbers = {\fira@figurealign,Lining},
+      [ Numbers = {\fira@otffigurealign,Lining},
         UprightFont    = *-\fira@regstyle ,
-        ItalicFont     = *-\fira@regstyle Italic ,
+        ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
       ]
       {FiraSans}
   \newfontfamily\firatabular
-    [ Numbers = {Monospaced,\fira@figurestyle},
+    [ Numbers = {Monospaced,\fira@otffigurestyle},
         UprightFont    = *-\fira@regstyle ,
-        ItalicFont     = *-\fira@regstyle Italic ,
+        ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
     ]
     {FiraSans}
   \newfontfamily\firaproportional
-    [ Numbers = {Proportional,\fira@figurestyle},
+    [ Numbers = {Proportional,\fira@otffigurestyle},
         UprightFont    = *-\fira@regstyle ,
-        ItalicFont     = *-\fira@regstyle Italic ,
+        ItalicFont = *-\ifx\fira@regstyle\fira@regular\else\fira@regstyle\fi Italic,
         BoldFont    = *-\fira@boldstyle ,
         BoldItalicFont     = *-\fira@boldstyle Italic ,
     ]
     {FiraSans}
   \newfontfamily\firathin
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-Thin ,
         ItalicFont     = *-ThinItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -180,7 +181,7 @@
       ]
       {FiraSans}
   \newfontfamily\firalight
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-Light ,
         ItalicFont     = *-LightItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -188,7 +189,7 @@
       ]
       {FiraSans}
   \newfontfamily\firaextralight
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-ExtraLight ,
         ItalicFont     = *-ExtraLightItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -196,7 +197,7 @@
       ]
       {FiraSans}
   \newfontfamily\firaultralight
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-UltraLight ,
         ItalicFont     = *-UltraLightItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -204,7 +205,7 @@
       ]
       {FiraSans}
   \newfontfamily\firamedium
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-Medium ,
         ItalicFont     = *-MediumItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -212,7 +213,7 @@
       ]
       {FiraSans}
   \newfontfamily\firabook
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-Book ,
         ItalicFont     = *-BookItalic ,
         BoldFont    = *-\fira@boldstyle ,
@@ -220,19 +221,19 @@
       ]
       {FiraSans}
   \newfontfamily\firasemibold
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-SemiBold ,
         ItalicFont     = *-SemiBoldItalic ,
       ]
       {FiraSans}
   \newfontfamily\firaextrabold
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-ExtraBold ,
         ItalicFont     = *-ExtraBoldItalic ,
       ]
       {FiraSans}
   \newfontfamily\firaheavy
-      [ Numbers = {\fira@figurealign,\fira@figurestyle},
+      [ Numbers = {\fira@otffigurealign,\fira@otffigurestyle},
         UprightFont    = *-Heavy ,
         ItalicFont     = *-HeavyItalic ,
       ]
@@ -240,6 +241,7 @@
 
 \else % type1
 
+
   \def\fira@family{FiraSans-\fira@figurealign\fira@figurestyle}
   \renewcommand*\sfdefault{\fira@family}
   \iffira@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
@@ -265,6 +267,8 @@
 
 \fi
 
+%  Use FireSans-... as the family, even for otf.
+\def\firalgr{\fontencoding{LGR}\fontfamily{FiraSans-\fira@figurealign\fira@figurestyle}\selectfont}
 
 \iffira@otf
   \defaultfontfeatures{}
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-Sup.fd
new file mode 100644
index 00000000000..9a9f840a832
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-Sup.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraMono-Sup.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraMono-Sup.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraMono-Sup}{}
+
+\DeclareFontShape{LGR}{FiraMono-Sup}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-Sup}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-Sup}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-Sup}{bx}{n}{
+      <-> ssub * FiraMono-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TLF.fd
new file mode 100644
index 00000000000..60a7670e34b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TLF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraMono-TLF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraMono-TLF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraMono-TLF}{}
+
+\DeclareFontShape{LGR}{FiraMono-TLF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TLF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TLF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TLF}{bx}{n}{
+      <-> ssub * FiraMono-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TOsF.fd
new file mode 100644
index 00000000000..0e73837b4dc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraMono-TOsF.fd
@@ -0,0 +1,30 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraMono-TOsF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraMono-TOsF.]
+
+\expandafter\ifx\csname FiraMono@scale\endcsname\relax
+    \let\FiraMono@@scale\@empty
+\else
+    \edef\FiraMono@@scale{s*[\csname FiraMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraMono-TOsF}{}
+
+\DeclareFontShape{LGR}{FiraMono-TOsF}{b}{n}{
+      <-> \FiraMono@@scale FiraMono-Bold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TOsF}{mb}{n}{
+      <-> \FiraMono@@scale FiraMono-Medium-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TOsF}{m}{n}{
+      <-> \FiraMono@@scale FiraMono-Regular-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraMono-TOsF}{bx}{n}{
+      <-> ssub * FiraMono-TOsF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd
new file mode 100644
index 00000000000..910dd61c62e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd
@@ -0,0 +1,302 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraSans-LF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraSans-LF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraSans-LF}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{scsl}{
+      <-> ssub * FiraSans-LF/ul/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ul}{sl}{
+      <-> ssub * FiraSans-LF/ul/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scsl}{
+      <-> ssub * FiraSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sl}{
+      <-> ssub * FiraSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scsl}{
+      <-> ssub * FiraSans-LF/sb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sl}{
+      <-> ssub * FiraSans-LF/sb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{scsl}{
+      <-> ssub * FiraSans-LF/mb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{mb}{sl}{
+      <-> ssub * FiraSans-LF/mb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{scsl}{
+      <-> ssub * FiraSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{sl}{
+      <-> ssub * FiraSans-LF/m/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{scsl}{
+      <-> ssub * FiraSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{sl}{
+      <-> ssub * FiraSans-LF/l/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{scsl}{
+      <-> ssub * FiraSans-LF/sl/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{sl}{sl}{
+      <-> ssub * FiraSans-LF/sl/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{scsl}{
+      <-> ssub * FiraSans-LF/h/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{h}{sl}{
+      <-> ssub * FiraSans-LF/h/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{scsl}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{b}{sl}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{scsl}{
+      <-> ssub * FiraSans-LF/el/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{sl}{
+      <-> ssub * FiraSans-LF/el/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{scsl}{
+      <-> ssub * FiraSans-LF/t/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{t}{sl}{
+      <-> ssub * FiraSans-LF/t/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{sl}{
+      <-> ssub * FiraSans-LF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{scsl}{
+      <-> ssub * FiraSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{sc}{
+      <-> ssub * FiraSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{n}{
+      <-> ssub * FiraSans-LF/b/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{it}{
+      <-> ssub * FiraSans-LF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{bx}{scit}{
+      <-> ssub * FiraSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd
new file mode 100644
index 00000000000..bd87c97f39c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd
@@ -0,0 +1,302 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraSans-OsF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraSans-OsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraSans-OsF}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{scsl}{
+      <-> ssub * FiraSans-OsF/ul/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{sl}{
+      <-> ssub * FiraSans-OsF/ul/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scsl}{
+      <-> ssub * FiraSans-OsF/eb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sl}{
+      <-> ssub * FiraSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scsl}{
+      <-> ssub * FiraSans-OsF/sb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sl}{
+      <-> ssub * FiraSans-OsF/sb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{scsl}{
+      <-> ssub * FiraSans-OsF/mb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{mb}{sl}{
+      <-> ssub * FiraSans-OsF/mb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scsl}{
+      <-> ssub * FiraSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sl}{
+      <-> ssub * FiraSans-OsF/m/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scsl}{
+      <-> ssub * FiraSans-OsF/l/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sl}{
+      <-> ssub * FiraSans-OsF/l/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{scsl}{
+      <-> ssub * FiraSans-OsF/sl/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{sl}{sl}{
+      <-> ssub * FiraSans-OsF/sl/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{scsl}{
+      <-> ssub * FiraSans-OsF/h/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{h}{sl}{
+      <-> ssub * FiraSans-OsF/h/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{b}{sl}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scsl}{
+      <-> ssub * FiraSans-OsF/el/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sl}{
+      <-> ssub * FiraSans-OsF/el/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{scsl}{
+      <-> ssub * FiraSans-OsF/t/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{t}{sl}{
+      <-> ssub * FiraSans-OsF/t/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{sl}{
+      <-> ssub * FiraSans-OsF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{scsl}{
+      <-> ssub * FiraSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{sc}{
+      <-> ssub * FiraSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{n}{
+      <-> ssub * FiraSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{it}{
+      <-> ssub * FiraSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{scit}{
+      <-> ssub * FiraSans-OsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd
new file mode 100644
index 00000000000..de1571bffff
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd
@@ -0,0 +1,158 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraSans-Sup.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraSans-Sup.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraSans-Sup}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ul}{sl}{
+      <-> ssub * FiraSans-Sup/ul/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{sl}{
+      <-> ssub * FiraSans-Sup/eb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{sl}{
+      <-> ssub * FiraSans-Sup/sb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{mb}{sl}{
+      <-> ssub * FiraSans-Sup/mb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{sl}{
+      <-> ssub * FiraSans-Sup/m/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{sl}{
+      <-> ssub * FiraSans-Sup/l/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sl}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sl}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{sl}{sl}{
+      <-> ssub * FiraSans-Sup/sl/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{h}{sl}{
+      <-> ssub * FiraSans-Sup/h/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{b}{sl}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{sl}{
+      <-> ssub * FiraSans-Sup/el/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{t}{sl}{
+      <-> ssub * FiraSans-Sup/t/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{bx}{sl}{
+      <-> ssub * FiraSans-Sup/b/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{bx}{n}{
+      <-> ssub * FiraSans-Sup/b/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{bx}{it}{
+      <-> ssub * FiraSans-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd
new file mode 100644
index 00000000000..6870a3ff396
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd
@@ -0,0 +1,302 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraSans-TLF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraSans-TLF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraSans-TLF}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{scsl}{
+      <-> ssub * FiraSans-TLF/ul/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{sl}{
+      <-> ssub * FiraSans-TLF/ul/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scsl}{
+      <-> ssub * FiraSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sl}{
+      <-> ssub * FiraSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scsl}{
+      <-> ssub * FiraSans-TLF/sb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sl}{
+      <-> ssub * FiraSans-TLF/sb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{scsl}{
+      <-> ssub * FiraSans-TLF/mb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{mb}{sl}{
+      <-> ssub * FiraSans-TLF/mb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scsl}{
+      <-> ssub * FiraSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sl}{
+      <-> ssub * FiraSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scsl}{
+      <-> ssub * FiraSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sl}{
+      <-> ssub * FiraSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{scsl}{
+      <-> ssub * FiraSans-TLF/sl/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{sl}{sl}{
+      <-> ssub * FiraSans-TLF/sl/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{scsl}{
+      <-> ssub * FiraSans-TLF/h/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{h}{sl}{
+      <-> ssub * FiraSans-TLF/h/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{b}{sl}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scsl}{
+      <-> ssub * FiraSans-TLF/el/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sl}{
+      <-> ssub * FiraSans-TLF/el/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{scsl}{
+      <-> ssub * FiraSans-TLF/t/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{t}{sl}{
+      <-> ssub * FiraSans-TLF/t/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{sl}{
+      <-> ssub * FiraSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{scsl}{
+      <-> ssub * FiraSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{sc}{
+      <-> ssub * FiraSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{n}{
+      <-> ssub * FiraSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{it}{
+      <-> ssub * FiraSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{scit}{
+      <-> ssub * FiraSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd
new file mode 100644
index 00000000000..53715750ac5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd
@@ -0,0 +1,302 @@
+%% Generated by autoinst on 2018/05/23
+%%
+\ProvidesFile{LGRFiraSans-TOsF.fd}
+    [2018/05/23 (autoinst)  Font definitions for LGR/FiraSans-TOsF.]
+
+\expandafter\ifx\csname FiraSans@scale\endcsname\relax
+    \let\FiraSans@@scale\@empty
+\else
+    \edef\FiraSans@@scale{s*[\csname FiraSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{FiraSans-TOsF}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{sc}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{n}{
+      <-> \FiraSans@@scale FiraSans-UltraLight-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{it}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{scit}{
+      <-> \FiraSans@@scale FiraSans-UltraLightItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{scsl}{
+      <-> ssub * FiraSans-TOsF/ul/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{sl}{
+      <-> ssub * FiraSans-TOsF/ul/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scsl}{
+      <-> ssub * FiraSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sl}{
+      <-> ssub * FiraSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sc}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{n}{
+      <-> \FiraSans@@scale FiraSans-SemiBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{it}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scit}{
+      <-> \FiraSans@@scale FiraSans-SemiBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scsl}{
+      <-> ssub * FiraSans-TOsF/sb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sl}{
+      <-> ssub * FiraSans-TOsF/sb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{sc}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{n}{
+      <-> \FiraSans@@scale FiraSans-Medium-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{it}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{scit}{
+      <-> \FiraSans@@scale FiraSans-MediumItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{scsl}{
+      <-> ssub * FiraSans-TOsF/mb/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{mb}{sl}{
+      <-> ssub * FiraSans-TOsF/mb/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sc}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{n}{
+      <-> \FiraSans@@scale FiraSans-Regular-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{it}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scit}{
+      <-> \FiraSans@@scale FiraSans-Italic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scsl}{
+      <-> ssub * FiraSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sl}{
+      <-> ssub * FiraSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sc}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{n}{
+      <-> \FiraSans@@scale FiraSans-Light-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{it}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scit}{
+      <-> \FiraSans@@scale FiraSans-LightItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scsl}{
+      <-> ssub * FiraSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sl}{
+      <-> ssub * FiraSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{sc}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{n}{
+      <-> \FiraSans@@scale FiraSans-Book-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{it}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{scit}{
+      <-> \FiraSans@@scale FiraSans-BookItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{scsl}{
+      <-> ssub * FiraSans-TOsF/sl/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sl}{sl}{
+      <-> ssub * FiraSans-TOsF/sl/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{sc}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{n}{
+      <-> \FiraSans@@scale FiraSans-Heavy-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{it}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{scit}{
+      <-> \FiraSans@@scale FiraSans-HeavyItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{scsl}{
+      <-> ssub * FiraSans-TOsF/h/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{h}{sl}{
+      <-> ssub * FiraSans-TOsF/h/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{sc}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{n}{
+      <-> \FiraSans@@scale FiraSans-Bold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{it}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{scit}{
+      <-> \FiraSans@@scale FiraSans-BoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{b}{sl}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sc}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{n}{
+      <-> \FiraSans@@scale FiraSans-ExtraLight-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{it}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scit}{
+      <-> \FiraSans@@scale FiraSans-ExtraLightItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scsl}{
+      <-> ssub * FiraSans-TOsF/el/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sl}{
+      <-> ssub * FiraSans-TOsF/el/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{sc}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{n}{
+      <-> \FiraSans@@scale FiraSans-Thin-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{it}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{scit}{
+      <-> \FiraSans@@scale FiraSans-ThinItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{scsl}{
+      <-> ssub * FiraSans-TOsF/t/scit
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{t}{sl}{
+      <-> ssub * FiraSans-TOsF/t/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{sl}{
+      <-> ssub * FiraSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{scsl}{
+      <-> ssub * FiraSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{sc}{
+      <-> ssub * FiraSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{n}{
+      <-> ssub * FiraSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{it}{
+      <-> ssub * FiraSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{scit}{
+      <-> ssub * FiraSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd
index 6b7eb139fd1..561b1cc9697 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraMono-Sup.fd}
-    [2015/05/23 (autoinst)  Font definitions for LY1/FiraMono-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraMono-Sup.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd
index afaad1f5c86..3c61d5856f9 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraMono-TLF.fd}
-    [2015/05/23 (autoinst)  Font definitions for LY1/FiraMono-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraMono-TLF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd
index 2b03d564c16..b427b8af2e1 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraMono-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraMono-TOsF.fd}
-    [2015/05/23 (autoinst)  Font definitions for LY1/FiraMono-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraMono-TOsF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
index a1e2ca2eaee..10031cfa0dc 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraSans-LF.fd}
-    [2018/01/09 (autoinst)  Font definitions for LY1/FiraSans-LF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
index 2b31b299c3f..7f3ae38b208 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraSans-OsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for LY1/FiraSans-OsF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
index 74a3ca7e746..043b68068a5 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraSans-Sup.fd}
-    [2018/01/09 (autoinst)  Font definitions for LY1/FiraSans-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
index 52ab2e31284..22a6c224afc 100644
--- a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraSans-TLF.fd}
-    [2018/01/09 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
index 9ef4d0179d8..71f4b2c2145 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{LY1FiraSans-TOsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for LY1/FiraSans-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for LY1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd
index 77e0481298f..9dff48c8e26 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraMono-Sup.fd}
-    [2015/05/23 (autoinst)  Font definitions for OT1/FiraMono-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraMono-Sup.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd
index a9bdd2ddb93..49cb9363839 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraMono-TLF.fd}
-    [2015/05/23 (autoinst)  Font definitions for OT1/FiraMono-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraMono-TLF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd
index 02fbf5d3827..1cfd510fbdb 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraMono-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraMono-TOsF.fd}
-    [2015/05/23 (autoinst)  Font definitions for OT1/FiraMono-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraMono-TOsF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
index eef7c0e8dc3..0b4fb5f45d4 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraSans-LF.fd}
-    [2018/01/09 (autoinst)  Font definitions for OT1/FiraSans-LF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
index 4e0425b1846..f2e9dbf72bd 100644
--- a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraSans-OsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for OT1/FiraSans-OsF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
index 481ee895272..4204846f57c 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraSans-Sup.fd}
-    [2018/01/09 (autoinst)  Font definitions for OT1/FiraSans-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
index 3d7261414aa..36e559bbe73 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraSans-TLF.fd}
-    [2018/01/09 (autoinst)  Font definitions for OT1/FiraSans-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
index 14455c67551..c4ade1ea822 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{OT1FiraSans-TOsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for OT1/FiraSans-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for OT1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd
index 9524a1582be..66077fb05d6 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraMono-Sup.fd}
-    [2015/05/23 (autoinst)  Font definitions for T1/FiraMono-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraMono-Sup.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd
index 05dfd82bffb..f6cd49a1cad 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraMono-TLF.fd}
-    [2015/05/23 (autoinst)  Font definitions for T1/FiraMono-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraMono-TLF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd
index 6801f0906a7..e69e3e8d08d 100644
--- a/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/T1FiraMono-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraMono-TOsF.fd}
-    [2015/05/23 (autoinst)  Font definitions for T1/FiraMono-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraMono-TOsF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
index 2aaf47cdd1a..aa79b80fde1 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraSans-LF.fd}
-    [2018/01/09 (autoinst)  Font definitions for T1/FiraSans-LF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
index 2951217b579..831e77c02d5 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraSans-OsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for T1/FiraSans-OsF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
index f4130ef575b..d6988c0ea6f 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraSans-Sup.fd}
-    [2018/01/09 (autoinst)  Font definitions for T1/FiraSans-Sup.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraSans-Sup.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
index 635227c0a29..6f073fc6b39 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraSans-TLF.fd}
-    [2018/01/09 (autoinst)  Font definitions for T1/FiraSans-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
index 6ca59d172fb..7af43039b4d 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{T1FiraSans-TOsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for T1/FiraSans-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for T1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd
index 83bd0b0c094..aa07dc1c2d9 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraMono-TLF.fd}
-    [2015/05/23 (autoinst)  Font definitions for TS1/FiraMono-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraMono-TLF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd
index df1932af919..5d527ff555b 100644
--- a/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/TS1FiraMono-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2015/05/23
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraMono-TOsF.fd}
-    [2015/05/23 (autoinst)  Font definitions for TS1/FiraMono-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraMono-TOsF.]
 
 \expandafter\ifx\csname FiraMono@scale\endcsname\relax
     \let\FiraMono@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
index 148170bbaa3..4f0af3b97d9 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraSans-LF.fd}
-    [2018/01/09 (autoinst)  Font definitions for TS1/FiraSans-LF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraSans-LF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
index 3c269680d3e..bbbf9c76b2e 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraSans-OsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for TS1/FiraSans-OsF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraSans-OsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
index ddd8cfab33e..fd5608560ee 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraSans-TLF.fd}
-    [2018/01/09 (autoinst)  Font definitions for TS1/FiraSans-TLF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraSans-TLF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
index 884f42375b4..bda9d384100 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 2018/01/09
+%% Generated by autoinst on 2018/05/23
 %%
 \ProvidesFile{TS1FiraSans-TOsF.fd}
-    [2018/01/09 (autoinst)  Font definitions for TS1/FiraSans-TOsF.]
+    [2018/05/23 (autoinst)  Font definitions for TS1/FiraSans-TOsF.]
 
 \expandafter\ifx\csname FiraSans@scale\endcsname\relax
     \let\FiraSans@@scale\@empty