summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd190
-rw-r--r--Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd106
-rw-r--r--Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd106
24 files changed, 1944 insertions, 1944 deletions
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd
index 46d2ced8725..00563d9ba8a 100644
--- a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LGRFiraSans-LF.fd}
- [2019/04/04 (autoinst) Font definitions for LGR/FiraSans-LF.]
+ [2019/05/22 (autoinst) Font definitions for LGR/FiraSans-LF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{sl}{
- <-> ssub * FiraSans-LF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{scsl}{
- <-> ssub * FiraSans-LF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{sc}{
- <-> ssub * FiraSans-LF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{n}{
- <-> ssub * FiraSans-LF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{it}{
- <-> ssub * FiraSans-LF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-LF}{m}{scit}{
- <-> ssub * FiraSans-LF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LGR}{FiraSans-LF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sl}{
- <-> ssub * FiraSans-LF/extrabold/sl
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{sl}{
+ <-> ssub * FiraSans-LF/extralight/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scsl}{
- <-> ssub * FiraSans-LF/extrabold/scsl
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{scsl}{
+ <-> ssub * FiraSans-LF/extralight/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sc}{
- <-> ssub * FiraSans-LF/extrabold/sc
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{sc}{
+ <-> ssub * FiraSans-LF/extralight/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{n}{
- <-> ssub * FiraSans-LF/extrabold/n
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{n}{
+ <-> ssub * FiraSans-LF/extralight/n
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{it}{
- <-> ssub * FiraSans-LF/extrabold/it
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{it}{
+ <-> ssub * FiraSans-LF/extralight/it
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scit}{
- <-> ssub * FiraSans-LF/extrabold/scit
+\DeclareFontShape{LGR}{FiraSans-LF}{el}{scit}{
+ <-> ssub * FiraSans-LF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sl}{
- <-> ssub * FiraSans-LF/semibold/sl
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{sl}{
+ <-> ssub * FiraSans-LF/light/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scsl}{
- <-> ssub * FiraSans-LF/semibold/scsl
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{scsl}{
+ <-> ssub * FiraSans-LF/light/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sc}{
- <-> ssub * FiraSans-LF/semibold/sc
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{sc}{
+ <-> ssub * FiraSans-LF/light/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{n}{
- <-> ssub * FiraSans-LF/semibold/n
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{n}{
+ <-> ssub * FiraSans-LF/light/n
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{it}{
- <-> ssub * FiraSans-LF/semibold/it
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{it}{
+ <-> ssub * FiraSans-LF/light/it
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scit}{
- <-> ssub * FiraSans-LF/semibold/scit
+\DeclareFontShape{LGR}{FiraSans-LF}{l}{scit}{
+ <-> ssub * FiraSans-LF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{sl}{
- <-> ssub * FiraSans-LF/heavy/sl
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{sl}{
+ <-> ssub * FiraSans-LF/regular/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{scsl}{
- <-> ssub * FiraSans-LF/heavy/scsl
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{scsl}{
+ <-> ssub * FiraSans-LF/regular/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{sc}{
- <-> ssub * FiraSans-LF/heavy/sc
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{sc}{
+ <-> ssub * FiraSans-LF/regular/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{n}{
- <-> ssub * FiraSans-LF/heavy/n
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{n}{
+ <-> ssub * FiraSans-LF/regular/n
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{it}{
- <-> ssub * FiraSans-LF/heavy/it
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{it}{
+ <-> ssub * FiraSans-LF/regular/it
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{ub}{scit}{
- <-> ssub * FiraSans-LF/heavy/scit
+\DeclareFontShape{LGR}{FiraSans-LF}{m}{scit}{
+ <-> ssub * FiraSans-LF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{sl}{
- <-> ssub * FiraSans-LF/light/sl
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sl}{
+ <-> ssub * FiraSans-LF/semibold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{scsl}{
- <-> ssub * FiraSans-LF/light/scsl
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scsl}{
+ <-> ssub * FiraSans-LF/semibold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{sc}{
- <-> ssub * FiraSans-LF/light/sc
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{sc}{
+ <-> ssub * FiraSans-LF/semibold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{n}{
- <-> ssub * FiraSans-LF/light/n
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{n}{
+ <-> ssub * FiraSans-LF/semibold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{it}{
- <-> ssub * FiraSans-LF/light/it
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{it}{
+ <-> ssub * FiraSans-LF/semibold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{l}{scit}{
- <-> ssub * FiraSans-LF/light/scit
+\DeclareFontShape{LGR}{FiraSans-LF}{sb}{scit}{
+ <-> ssub * FiraSans-LF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{sl}{
- <-> ssub * FiraSans-LF/extralight/sl
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sl}{
+ <-> ssub * FiraSans-LF/extrabold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{scsl}{
- <-> ssub * FiraSans-LF/extralight/scsl
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scsl}{
+ <-> ssub * FiraSans-LF/extrabold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{sc}{
- <-> ssub * FiraSans-LF/extralight/sc
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{sc}{
+ <-> ssub * FiraSans-LF/extrabold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{n}{
- <-> ssub * FiraSans-LF/extralight/n
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{n}{
+ <-> ssub * FiraSans-LF/extrabold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{it}{
- <-> ssub * FiraSans-LF/extralight/it
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{it}{
+ <-> ssub * FiraSans-LF/extrabold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-LF}{el}{scit}{
- <-> ssub * FiraSans-LF/extralight/scit
+\DeclareFontShape{LGR}{FiraSans-LF}{eb}{scit}{
+ <-> ssub * FiraSans-LF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{sl}{
+ <-> ssub * FiraSans-LF/heavy/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{scsl}{
+ <-> ssub * FiraSans-LF/heavy/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{sc}{
+ <-> ssub * FiraSans-LF/heavy/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{n}{
+ <-> ssub * FiraSans-LF/heavy/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{it}{
+ <-> ssub * FiraSans-LF/heavy/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-LF}{ub}{scit}{
+ <-> ssub * FiraSans-LF/heavy/scit
}{}
\DeclareFontShape{LGR}{FiraSans-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd
index e12792504cb..95eea87cac6 100644
--- a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LGRFiraSans-OsF.fd}
- [2019/04/04 (autoinst) Font definitions for LGR/FiraSans-OsF.]
+ [2019/05/22 (autoinst) Font definitions for LGR/FiraSans-OsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sl}{
- <-> ssub * FiraSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scsl}{
- <-> ssub * FiraSans-OsF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sc}{
- <-> ssub * FiraSans-OsF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{n}{
- <-> ssub * FiraSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{it}{
- <-> ssub * FiraSans-OsF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scit}{
- <-> ssub * FiraSans-OsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LGR}{FiraSans-OsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sl}{
- <-> ssub * FiraSans-OsF/extrabold/sl
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sl}{
+ <-> ssub * FiraSans-OsF/extralight/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scsl}{
- <-> ssub * FiraSans-OsF/extrabold/scsl
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scsl}{
+ <-> ssub * FiraSans-OsF/extralight/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sc}{
- <-> ssub * FiraSans-OsF/extrabold/sc
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sc}{
+ <-> ssub * FiraSans-OsF/extralight/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{n}{
- <-> ssub * FiraSans-OsF/extrabold/n
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{n}{
+ <-> ssub * FiraSans-OsF/extralight/n
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{it}{
- <-> ssub * FiraSans-OsF/extrabold/it
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{it}{
+ <-> ssub * FiraSans-OsF/extralight/it
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scit}{
- <-> ssub * FiraSans-OsF/extrabold/scit
+\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scit}{
+ <-> ssub * FiraSans-OsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sl}{
- <-> ssub * FiraSans-OsF/semibold/sl
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sl}{
+ <-> ssub * FiraSans-OsF/light/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scsl}{
- <-> ssub * FiraSans-OsF/semibold/scsl
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scsl}{
+ <-> ssub * FiraSans-OsF/light/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sc}{
- <-> ssub * FiraSans-OsF/semibold/sc
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sc}{
+ <-> ssub * FiraSans-OsF/light/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{n}{
- <-> ssub * FiraSans-OsF/semibold/n
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{n}{
+ <-> ssub * FiraSans-OsF/light/n
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{it}{
- <-> ssub * FiraSans-OsF/semibold/it
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{it}{
+ <-> ssub * FiraSans-OsF/light/it
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scit}{
- <-> ssub * FiraSans-OsF/semibold/scit
+\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scit}{
+ <-> ssub * FiraSans-OsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{sl}{
- <-> ssub * FiraSans-OsF/heavy/sl
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sl}{
+ <-> ssub * FiraSans-OsF/regular/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{scsl}{
- <-> ssub * FiraSans-OsF/heavy/scsl
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scsl}{
+ <-> ssub * FiraSans-OsF/regular/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{sc}{
- <-> ssub * FiraSans-OsF/heavy/sc
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{sc}{
+ <-> ssub * FiraSans-OsF/regular/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{n}{
- <-> ssub * FiraSans-OsF/heavy/n
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{n}{
+ <-> ssub * FiraSans-OsF/regular/n
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{it}{
- <-> ssub * FiraSans-OsF/heavy/it
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{it}{
+ <-> ssub * FiraSans-OsF/regular/it
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{scit}{
- <-> ssub * FiraSans-OsF/heavy/scit
+\DeclareFontShape{LGR}{FiraSans-OsF}{m}{scit}{
+ <-> ssub * FiraSans-OsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sl}{
- <-> ssub * FiraSans-OsF/light/sl
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sl}{
+ <-> ssub * FiraSans-OsF/semibold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scsl}{
- <-> ssub * FiraSans-OsF/light/scsl
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scsl}{
+ <-> ssub * FiraSans-OsF/semibold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{sc}{
- <-> ssub * FiraSans-OsF/light/sc
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{sc}{
+ <-> ssub * FiraSans-OsF/semibold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{n}{
- <-> ssub * FiraSans-OsF/light/n
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{n}{
+ <-> ssub * FiraSans-OsF/semibold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{it}{
- <-> ssub * FiraSans-OsF/light/it
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{it}{
+ <-> ssub * FiraSans-OsF/semibold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{l}{scit}{
- <-> ssub * FiraSans-OsF/light/scit
+\DeclareFontShape{LGR}{FiraSans-OsF}{sb}{scit}{
+ <-> ssub * FiraSans-OsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sl}{
- <-> ssub * FiraSans-OsF/extralight/sl
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sl}{
+ <-> ssub * FiraSans-OsF/extrabold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scsl}{
- <-> ssub * FiraSans-OsF/extralight/scsl
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scsl}{
+ <-> ssub * FiraSans-OsF/extrabold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{sc}{
- <-> ssub * FiraSans-OsF/extralight/sc
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{sc}{
+ <-> ssub * FiraSans-OsF/extrabold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{n}{
- <-> ssub * FiraSans-OsF/extralight/n
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{n}{
+ <-> ssub * FiraSans-OsF/extrabold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{it}{
- <-> ssub * FiraSans-OsF/extralight/it
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{it}{
+ <-> ssub * FiraSans-OsF/extrabold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-OsF}{el}{scit}{
- <-> ssub * FiraSans-OsF/extralight/scit
+\DeclareFontShape{LGR}{FiraSans-OsF}{eb}{scit}{
+ <-> ssub * FiraSans-OsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{sl}{
+ <-> ssub * FiraSans-OsF/heavy/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{scsl}{
+ <-> ssub * FiraSans-OsF/heavy/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{sc}{
+ <-> ssub * FiraSans-OsF/heavy/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{n}{
+ <-> ssub * FiraSans-OsF/heavy/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{it}{
+ <-> ssub * FiraSans-OsF/heavy/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-OsF}{ub}{scit}{
+ <-> ssub * FiraSans-OsF/heavy/scit
}{}
\DeclareFontShape{LGR}{FiraSans-OsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd
index 4460bbb830b..a476fe01b78 100644
--- a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LGRFiraSans-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for LGR/FiraSans-Sup.]
+ [2019/05/22 (autoinst) Font definitions for LGR/FiraSans-Sup.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LGR}{FiraSans-Sup}{m}{sl}{
- <-> ssub * FiraSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-Sup}{m}{n}{
- <-> ssub * FiraSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-Sup}{m}{it}{
- <-> ssub * FiraSans-Sup/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LGR}{FiraSans-Sup}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{sl}{
- <-> ssub * FiraSans-Sup/extrabold/sl
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{sl}{
+ <-> ssub * FiraSans-Sup/extralight/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{n}{
- <-> ssub * FiraSans-Sup/extrabold/n
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{n}{
+ <-> ssub * FiraSans-Sup/extralight/n
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{it}{
- <-> ssub * FiraSans-Sup/extrabold/it
+\DeclareFontShape{LGR}{FiraSans-Sup}{el}{it}{
+ <-> ssub * FiraSans-Sup/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{sl}{
- <-> ssub * FiraSans-Sup/semibold/sl
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{sl}{
+ <-> ssub * FiraSans-Sup/light/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{n}{
- <-> ssub * FiraSans-Sup/semibold/n
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{n}{
+ <-> ssub * FiraSans-Sup/light/n
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{it}{
- <-> ssub * FiraSans-Sup/semibold/it
+\DeclareFontShape{LGR}{FiraSans-Sup}{l}{it}{
+ <-> ssub * FiraSans-Sup/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{sl}{
- <-> ssub * FiraSans-Sup/heavy/sl
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{sl}{
+ <-> ssub * FiraSans-Sup/regular/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{n}{
- <-> ssub * FiraSans-Sup/heavy/n
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{n}{
+ <-> ssub * FiraSans-Sup/regular/n
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{it}{
- <-> ssub * FiraSans-Sup/heavy/it
+\DeclareFontShape{LGR}{FiraSans-Sup}{m}{it}{
+ <-> ssub * FiraSans-Sup/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LGR}{FiraSans-Sup}{l}{sl}{
- <-> ssub * FiraSans-Sup/light/sl
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{sl}{
+ <-> ssub * FiraSans-Sup/semibold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{l}{n}{
- <-> ssub * FiraSans-Sup/light/n
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{n}{
+ <-> ssub * FiraSans-Sup/semibold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{l}{it}{
- <-> ssub * FiraSans-Sup/light/it
+\DeclareFontShape{LGR}{FiraSans-Sup}{sb}{it}{
+ <-> ssub * FiraSans-Sup/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LGR}{FiraSans-Sup}{el}{sl}{
- <-> ssub * FiraSans-Sup/extralight/sl
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{sl}{
+ <-> ssub * FiraSans-Sup/extrabold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{el}{n}{
- <-> ssub * FiraSans-Sup/extralight/n
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{n}{
+ <-> ssub * FiraSans-Sup/extrabold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-Sup}{el}{it}{
- <-> ssub * FiraSans-Sup/extralight/it
+\DeclareFontShape{LGR}{FiraSans-Sup}{eb}{it}{
+ <-> ssub * FiraSans-Sup/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{sl}{
+ <-> ssub * FiraSans-Sup/heavy/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{n}{
+ <-> ssub * FiraSans-Sup/heavy/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-Sup}{ub}{it}{
+ <-> ssub * FiraSans-Sup/heavy/it
}{}
\DeclareFontShape{LGR}{FiraSans-Sup}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd
index 7929902b1be..9c67fd59292 100644
--- a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LGRFiraSans-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for LGR/FiraSans-TLF.]
+ [2019/05/22 (autoinst) Font definitions for LGR/FiraSans-TLF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sl}{
- <-> ssub * FiraSans-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scsl}{
- <-> ssub * FiraSans-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sc}{
- <-> ssub * FiraSans-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{n}{
- <-> ssub * FiraSans-TLF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{it}{
- <-> ssub * FiraSans-TLF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scit}{
- <-> ssub * FiraSans-TLF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LGR}{FiraSans-TLF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sl}{
- <-> ssub * FiraSans-TLF/extrabold/sl
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sl}{
+ <-> ssub * FiraSans-TLF/extralight/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scsl}{
- <-> ssub * FiraSans-TLF/extrabold/scsl
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scsl}{
+ <-> ssub * FiraSans-TLF/extralight/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sc}{
- <-> ssub * FiraSans-TLF/extrabold/sc
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sc}{
+ <-> ssub * FiraSans-TLF/extralight/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{n}{
- <-> ssub * FiraSans-TLF/extrabold/n
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{n}{
+ <-> ssub * FiraSans-TLF/extralight/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{it}{
- <-> ssub * FiraSans-TLF/extrabold/it
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{it}{
+ <-> ssub * FiraSans-TLF/extralight/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scit}{
- <-> ssub * FiraSans-TLF/extrabold/scit
+\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scit}{
+ <-> ssub * FiraSans-TLF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sl}{
- <-> ssub * FiraSans-TLF/semibold/sl
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sl}{
+ <-> ssub * FiraSans-TLF/light/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scsl}{
- <-> ssub * FiraSans-TLF/semibold/scsl
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scsl}{
+ <-> ssub * FiraSans-TLF/light/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sc}{
- <-> ssub * FiraSans-TLF/semibold/sc
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sc}{
+ <-> ssub * FiraSans-TLF/light/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{n}{
- <-> ssub * FiraSans-TLF/semibold/n
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{n}{
+ <-> ssub * FiraSans-TLF/light/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{it}{
- <-> ssub * FiraSans-TLF/semibold/it
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{it}{
+ <-> ssub * FiraSans-TLF/light/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scit}{
- <-> ssub * FiraSans-TLF/semibold/scit
+\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scit}{
+ <-> ssub * FiraSans-TLF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{sl}{
- <-> ssub * FiraSans-TLF/heavy/sl
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sl}{
+ <-> ssub * FiraSans-TLF/regular/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{scsl}{
- <-> ssub * FiraSans-TLF/heavy/scsl
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scsl}{
+ <-> ssub * FiraSans-TLF/regular/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{sc}{
- <-> ssub * FiraSans-TLF/heavy/sc
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{sc}{
+ <-> ssub * FiraSans-TLF/regular/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{n}{
- <-> ssub * FiraSans-TLF/heavy/n
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{n}{
+ <-> ssub * FiraSans-TLF/regular/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{it}{
- <-> ssub * FiraSans-TLF/heavy/it
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{it}{
+ <-> ssub * FiraSans-TLF/regular/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{scit}{
- <-> ssub * FiraSans-TLF/heavy/scit
+\DeclareFontShape{LGR}{FiraSans-TLF}{m}{scit}{
+ <-> ssub * FiraSans-TLF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sl}{
- <-> ssub * FiraSans-TLF/light/sl
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sl}{
+ <-> ssub * FiraSans-TLF/semibold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scsl}{
- <-> ssub * FiraSans-TLF/light/scsl
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scsl}{
+ <-> ssub * FiraSans-TLF/semibold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{sc}{
- <-> ssub * FiraSans-TLF/light/sc
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{sc}{
+ <-> ssub * FiraSans-TLF/semibold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{n}{
- <-> ssub * FiraSans-TLF/light/n
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{n}{
+ <-> ssub * FiraSans-TLF/semibold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{it}{
- <-> ssub * FiraSans-TLF/light/it
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{it}{
+ <-> ssub * FiraSans-TLF/semibold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{l}{scit}{
- <-> ssub * FiraSans-TLF/light/scit
+\DeclareFontShape{LGR}{FiraSans-TLF}{sb}{scit}{
+ <-> ssub * FiraSans-TLF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sl}{
- <-> ssub * FiraSans-TLF/extralight/sl
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sl}{
+ <-> ssub * FiraSans-TLF/extrabold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scsl}{
- <-> ssub * FiraSans-TLF/extralight/scsl
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scsl}{
+ <-> ssub * FiraSans-TLF/extrabold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{sc}{
- <-> ssub * FiraSans-TLF/extralight/sc
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{sc}{
+ <-> ssub * FiraSans-TLF/extrabold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{n}{
- <-> ssub * FiraSans-TLF/extralight/n
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{n}{
+ <-> ssub * FiraSans-TLF/extrabold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{it}{
- <-> ssub * FiraSans-TLF/extralight/it
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{it}{
+ <-> ssub * FiraSans-TLF/extrabold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TLF}{el}{scit}{
- <-> ssub * FiraSans-TLF/extralight/scit
+\DeclareFontShape{LGR}{FiraSans-TLF}{eb}{scit}{
+ <-> ssub * FiraSans-TLF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{sl}{
+ <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{scsl}{
+ <-> ssub * FiraSans-TLF/heavy/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{sc}{
+ <-> ssub * FiraSans-TLF/heavy/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{n}{
+ <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{it}{
+ <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TLF}{ub}{scit}{
+ <-> ssub * FiraSans-TLF/heavy/scit
}{}
\DeclareFontShape{LGR}{FiraSans-TLF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd
index 7c80233950c..d59093ed43f 100644
--- a/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/fira/LGRFiraSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LGRFiraSans-TOsF.fd}
- [2019/04/04 (autoinst) Font definitions for LGR/FiraSans-TOsF.]
+ [2019/05/22 (autoinst) Font definitions for LGR/FiraSans-TOsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sl}{
- <-> ssub * FiraSans-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scsl}{
- <-> ssub * FiraSans-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sc}{
- <-> ssub * FiraSans-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{n}{
- <-> ssub * FiraSans-TOsF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{it}{
- <-> ssub * FiraSans-TOsF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scit}{
- <-> ssub * FiraSans-TOsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LGR}{FiraSans-TOsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sl}{
- <-> ssub * FiraSans-TOsF/extrabold/sl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sl}{
+ <-> ssub * FiraSans-TOsF/extralight/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scsl}{
- <-> ssub * FiraSans-TOsF/extrabold/scsl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scsl}{
+ <-> ssub * FiraSans-TOsF/extralight/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sc}{
- <-> ssub * FiraSans-TOsF/extrabold/sc
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sc}{
+ <-> ssub * FiraSans-TOsF/extralight/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{n}{
- <-> ssub * FiraSans-TOsF/extrabold/n
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{n}{
+ <-> ssub * FiraSans-TOsF/extralight/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{it}{
- <-> ssub * FiraSans-TOsF/extrabold/it
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{it}{
+ <-> ssub * FiraSans-TOsF/extralight/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scit}{
- <-> ssub * FiraSans-TOsF/extrabold/scit
+\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scit}{
+ <-> ssub * FiraSans-TOsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sl}{
- <-> ssub * FiraSans-TOsF/semibold/sl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sl}{
+ <-> ssub * FiraSans-TOsF/light/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scsl}{
- <-> ssub * FiraSans-TOsF/semibold/scsl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scsl}{
+ <-> ssub * FiraSans-TOsF/light/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sc}{
- <-> ssub * FiraSans-TOsF/semibold/sc
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sc}{
+ <-> ssub * FiraSans-TOsF/light/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{n}{
- <-> ssub * FiraSans-TOsF/semibold/n
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{n}{
+ <-> ssub * FiraSans-TOsF/light/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{it}{
- <-> ssub * FiraSans-TOsF/semibold/it
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{it}{
+ <-> ssub * FiraSans-TOsF/light/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scit}{
- <-> ssub * FiraSans-TOsF/semibold/scit
+\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scit}{
+ <-> ssub * FiraSans-TOsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{sl}{
- <-> ssub * FiraSans-TOsF/heavy/sl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sl}{
+ <-> ssub * FiraSans-TOsF/regular/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{scsl}{
- <-> ssub * FiraSans-TOsF/heavy/scsl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scsl}{
+ <-> ssub * FiraSans-TOsF/regular/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{sc}{
- <-> ssub * FiraSans-TOsF/heavy/sc
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{sc}{
+ <-> ssub * FiraSans-TOsF/regular/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{n}{
- <-> ssub * FiraSans-TOsF/heavy/n
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{n}{
+ <-> ssub * FiraSans-TOsF/regular/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{it}{
- <-> ssub * FiraSans-TOsF/heavy/it
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{it}{
+ <-> ssub * FiraSans-TOsF/regular/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{scit}{
- <-> ssub * FiraSans-TOsF/heavy/scit
+\DeclareFontShape{LGR}{FiraSans-TOsF}{m}{scit}{
+ <-> ssub * FiraSans-TOsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sl}{
- <-> ssub * FiraSans-TOsF/light/sl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sl}{
+ <-> ssub * FiraSans-TOsF/semibold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scsl}{
- <-> ssub * FiraSans-TOsF/light/scsl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scsl}{
+ <-> ssub * FiraSans-TOsF/semibold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{sc}{
- <-> ssub * FiraSans-TOsF/light/sc
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{sc}{
+ <-> ssub * FiraSans-TOsF/semibold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{n}{
- <-> ssub * FiraSans-TOsF/light/n
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{n}{
+ <-> ssub * FiraSans-TOsF/semibold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{it}{
- <-> ssub * FiraSans-TOsF/light/it
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{it}{
+ <-> ssub * FiraSans-TOsF/semibold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{l}{scit}{
- <-> ssub * FiraSans-TOsF/light/scit
+\DeclareFontShape{LGR}{FiraSans-TOsF}{sb}{scit}{
+ <-> ssub * FiraSans-TOsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sl}{
- <-> ssub * FiraSans-TOsF/extralight/sl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sl}{
+ <-> ssub * FiraSans-TOsF/extrabold/sl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scsl}{
- <-> ssub * FiraSans-TOsF/extralight/scsl
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scsl}{
+ <-> ssub * FiraSans-TOsF/extrabold/scsl
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{sc}{
- <-> ssub * FiraSans-TOsF/extralight/sc
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{sc}{
+ <-> ssub * FiraSans-TOsF/extrabold/sc
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{n}{
- <-> ssub * FiraSans-TOsF/extralight/n
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{n}{
+ <-> ssub * FiraSans-TOsF/extrabold/n
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{it}{
- <-> ssub * FiraSans-TOsF/extralight/it
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{it}{
+ <-> ssub * FiraSans-TOsF/extrabold/it
}{}
-\DeclareFontShape{LGR}{FiraSans-TOsF}{el}{scit}{
- <-> ssub * FiraSans-TOsF/extralight/scit
+\DeclareFontShape{LGR}{FiraSans-TOsF}{eb}{scit}{
+ <-> ssub * FiraSans-TOsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{sl}{
+ <-> ssub * FiraSans-TOsF/heavy/sl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{scsl}{
+ <-> ssub * FiraSans-TOsF/heavy/scsl
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{sc}{
+ <-> ssub * FiraSans-TOsF/heavy/sc
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{n}{
+ <-> ssub * FiraSans-TOsF/heavy/n
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{it}{
+ <-> ssub * FiraSans-TOsF/heavy/it
+}{}
+
+\DeclareFontShape{LGR}{FiraSans-TOsF}{ub}{scit}{
+ <-> ssub * FiraSans-TOsF/heavy/scit
}{}
\DeclareFontShape{LGR}{FiraSans-TOsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-LF.fd
index 9df34f34a36..9271ebeb5cf 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LY1FiraSans-LF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/FiraSans-LF.]
+ [2019/05/22 (autoinst) Font definitions for LY1/FiraSans-LF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{sl}{
- <-> ssub * FiraSans-LF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{scsl}{
- <-> ssub * FiraSans-LF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{sc}{
- <-> ssub * FiraSans-LF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{n}{
- <-> ssub * FiraSans-LF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{it}{
- <-> ssub * FiraSans-LF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-LF}{m}{scit}{
- <-> ssub * FiraSans-LF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LY1}{FiraSans-LF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sl}{
- <-> ssub * FiraSans-LF/extrabold/sl
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{sl}{
+ <-> ssub * FiraSans-LF/extralight/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scsl}{
- <-> ssub * FiraSans-LF/extrabold/scsl
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{scsl}{
+ <-> ssub * FiraSans-LF/extralight/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sc}{
- <-> ssub * FiraSans-LF/extrabold/sc
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{sc}{
+ <-> ssub * FiraSans-LF/extralight/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{n}{
- <-> ssub * FiraSans-LF/extrabold/n
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{n}{
+ <-> ssub * FiraSans-LF/extralight/n
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{it}{
- <-> ssub * FiraSans-LF/extrabold/it
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{it}{
+ <-> ssub * FiraSans-LF/extralight/it
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scit}{
- <-> ssub * FiraSans-LF/extrabold/scit
+\DeclareFontShape{LY1}{FiraSans-LF}{el}{scit}{
+ <-> ssub * FiraSans-LF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sl}{
- <-> ssub * FiraSans-LF/semibold/sl
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{sl}{
+ <-> ssub * FiraSans-LF/light/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scsl}{
- <-> ssub * FiraSans-LF/semibold/scsl
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{scsl}{
+ <-> ssub * FiraSans-LF/light/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sc}{
- <-> ssub * FiraSans-LF/semibold/sc
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{sc}{
+ <-> ssub * FiraSans-LF/light/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{n}{
- <-> ssub * FiraSans-LF/semibold/n
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{n}{
+ <-> ssub * FiraSans-LF/light/n
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{it}{
- <-> ssub * FiraSans-LF/semibold/it
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{it}{
+ <-> ssub * FiraSans-LF/light/it
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scit}{
- <-> ssub * FiraSans-LF/semibold/scit
+\DeclareFontShape{LY1}{FiraSans-LF}{l}{scit}{
+ <-> ssub * FiraSans-LF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{sl}{
- <-> ssub * FiraSans-LF/heavy/sl
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{sl}{
+ <-> ssub * FiraSans-LF/regular/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{scsl}{
- <-> ssub * FiraSans-LF/heavy/scsl
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{scsl}{
+ <-> ssub * FiraSans-LF/regular/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{sc}{
- <-> ssub * FiraSans-LF/heavy/sc
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{sc}{
+ <-> ssub * FiraSans-LF/regular/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{n}{
- <-> ssub * FiraSans-LF/heavy/n
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{n}{
+ <-> ssub * FiraSans-LF/regular/n
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{it}{
- <-> ssub * FiraSans-LF/heavy/it
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{it}{
+ <-> ssub * FiraSans-LF/regular/it
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{ub}{scit}{
- <-> ssub * FiraSans-LF/heavy/scit
+\DeclareFontShape{LY1}{FiraSans-LF}{m}{scit}{
+ <-> ssub * FiraSans-LF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{sl}{
- <-> ssub * FiraSans-LF/light/sl
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sl}{
+ <-> ssub * FiraSans-LF/semibold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{scsl}{
- <-> ssub * FiraSans-LF/light/scsl
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scsl}{
+ <-> ssub * FiraSans-LF/semibold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{sc}{
- <-> ssub * FiraSans-LF/light/sc
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{sc}{
+ <-> ssub * FiraSans-LF/semibold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{n}{
- <-> ssub * FiraSans-LF/light/n
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{n}{
+ <-> ssub * FiraSans-LF/semibold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{it}{
- <-> ssub * FiraSans-LF/light/it
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{it}{
+ <-> ssub * FiraSans-LF/semibold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{l}{scit}{
- <-> ssub * FiraSans-LF/light/scit
+\DeclareFontShape{LY1}{FiraSans-LF}{sb}{scit}{
+ <-> ssub * FiraSans-LF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{sl}{
- <-> ssub * FiraSans-LF/extralight/sl
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sl}{
+ <-> ssub * FiraSans-LF/extrabold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{scsl}{
- <-> ssub * FiraSans-LF/extralight/scsl
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scsl}{
+ <-> ssub * FiraSans-LF/extrabold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{sc}{
- <-> ssub * FiraSans-LF/extralight/sc
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{sc}{
+ <-> ssub * FiraSans-LF/extrabold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{n}{
- <-> ssub * FiraSans-LF/extralight/n
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{n}{
+ <-> ssub * FiraSans-LF/extrabold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{it}{
- <-> ssub * FiraSans-LF/extralight/it
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{it}{
+ <-> ssub * FiraSans-LF/extrabold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-LF}{el}{scit}{
- <-> ssub * FiraSans-LF/extralight/scit
+\DeclareFontShape{LY1}{FiraSans-LF}{eb}{scit}{
+ <-> ssub * FiraSans-LF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{sl}{
+ <-> ssub * FiraSans-LF/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{scsl}{
+ <-> ssub * FiraSans-LF/heavy/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{sc}{
+ <-> ssub * FiraSans-LF/heavy/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{n}{
+ <-> ssub * FiraSans-LF/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{it}{
+ <-> ssub * FiraSans-LF/heavy/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-LF}{ub}{scit}{
+ <-> ssub * FiraSans-LF/heavy/scit
}{}
\DeclareFontShape{LY1}{FiraSans-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-OsF.fd
index cc50b3158db..f18445db691 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LY1FiraSans-OsF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/FiraSans-OsF.]
+ [2019/05/22 (autoinst) Font definitions for LY1/FiraSans-OsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sl}{
- <-> ssub * FiraSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scsl}{
- <-> ssub * FiraSans-OsF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sc}{
- <-> ssub * FiraSans-OsF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{n}{
- <-> ssub * FiraSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{it}{
- <-> ssub * FiraSans-OsF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scit}{
- <-> ssub * FiraSans-OsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LY1}{FiraSans-OsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sl}{
- <-> ssub * FiraSans-OsF/extrabold/sl
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sl}{
+ <-> ssub * FiraSans-OsF/extralight/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scsl}{
- <-> ssub * FiraSans-OsF/extrabold/scsl
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scsl}{
+ <-> ssub * FiraSans-OsF/extralight/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sc}{
- <-> ssub * FiraSans-OsF/extrabold/sc
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sc}{
+ <-> ssub * FiraSans-OsF/extralight/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{n}{
- <-> ssub * FiraSans-OsF/extrabold/n
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{n}{
+ <-> ssub * FiraSans-OsF/extralight/n
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{it}{
- <-> ssub * FiraSans-OsF/extrabold/it
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{it}{
+ <-> ssub * FiraSans-OsF/extralight/it
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scit}{
- <-> ssub * FiraSans-OsF/extrabold/scit
+\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scit}{
+ <-> ssub * FiraSans-OsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sl}{
- <-> ssub * FiraSans-OsF/semibold/sl
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sl}{
+ <-> ssub * FiraSans-OsF/light/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scsl}{
- <-> ssub * FiraSans-OsF/semibold/scsl
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scsl}{
+ <-> ssub * FiraSans-OsF/light/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sc}{
- <-> ssub * FiraSans-OsF/semibold/sc
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sc}{
+ <-> ssub * FiraSans-OsF/light/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{n}{
- <-> ssub * FiraSans-OsF/semibold/n
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{n}{
+ <-> ssub * FiraSans-OsF/light/n
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{it}{
- <-> ssub * FiraSans-OsF/semibold/it
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{it}{
+ <-> ssub * FiraSans-OsF/light/it
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scit}{
- <-> ssub * FiraSans-OsF/semibold/scit
+\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scit}{
+ <-> ssub * FiraSans-OsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{sl}{
- <-> ssub * FiraSans-OsF/heavy/sl
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sl}{
+ <-> ssub * FiraSans-OsF/regular/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{scsl}{
- <-> ssub * FiraSans-OsF/heavy/scsl
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scsl}{
+ <-> ssub * FiraSans-OsF/regular/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{sc}{
- <-> ssub * FiraSans-OsF/heavy/sc
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{sc}{
+ <-> ssub * FiraSans-OsF/regular/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{n}{
- <-> ssub * FiraSans-OsF/heavy/n
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{n}{
+ <-> ssub * FiraSans-OsF/regular/n
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{it}{
- <-> ssub * FiraSans-OsF/heavy/it
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{it}{
+ <-> ssub * FiraSans-OsF/regular/it
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{scit}{
- <-> ssub * FiraSans-OsF/heavy/scit
+\DeclareFontShape{LY1}{FiraSans-OsF}{m}{scit}{
+ <-> ssub * FiraSans-OsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sl}{
- <-> ssub * FiraSans-OsF/light/sl
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sl}{
+ <-> ssub * FiraSans-OsF/semibold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scsl}{
- <-> ssub * FiraSans-OsF/light/scsl
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scsl}{
+ <-> ssub * FiraSans-OsF/semibold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{sc}{
- <-> ssub * FiraSans-OsF/light/sc
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{sc}{
+ <-> ssub * FiraSans-OsF/semibold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{n}{
- <-> ssub * FiraSans-OsF/light/n
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{n}{
+ <-> ssub * FiraSans-OsF/semibold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{it}{
- <-> ssub * FiraSans-OsF/light/it
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{it}{
+ <-> ssub * FiraSans-OsF/semibold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{l}{scit}{
- <-> ssub * FiraSans-OsF/light/scit
+\DeclareFontShape{LY1}{FiraSans-OsF}{sb}{scit}{
+ <-> ssub * FiraSans-OsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sl}{
- <-> ssub * FiraSans-OsF/extralight/sl
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sl}{
+ <-> ssub * FiraSans-OsF/extrabold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scsl}{
- <-> ssub * FiraSans-OsF/extralight/scsl
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scsl}{
+ <-> ssub * FiraSans-OsF/extrabold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{sc}{
- <-> ssub * FiraSans-OsF/extralight/sc
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{sc}{
+ <-> ssub * FiraSans-OsF/extrabold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{n}{
- <-> ssub * FiraSans-OsF/extralight/n
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{n}{
+ <-> ssub * FiraSans-OsF/extrabold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{it}{
- <-> ssub * FiraSans-OsF/extralight/it
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{it}{
+ <-> ssub * FiraSans-OsF/extrabold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-OsF}{el}{scit}{
- <-> ssub * FiraSans-OsF/extralight/scit
+\DeclareFontShape{LY1}{FiraSans-OsF}{eb}{scit}{
+ <-> ssub * FiraSans-OsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{sl}{
+ <-> ssub * FiraSans-OsF/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{scsl}{
+ <-> ssub * FiraSans-OsF/heavy/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{sc}{
+ <-> ssub * FiraSans-OsF/heavy/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{n}{
+ <-> ssub * FiraSans-OsF/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{it}{
+ <-> ssub * FiraSans-OsF/heavy/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-OsF}{ub}{scit}{
+ <-> ssub * FiraSans-OsF/heavy/scit
}{}
\DeclareFontShape{LY1}{FiraSans-OsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-Sup.fd
index 2c186b39bcf..8a185a4568f 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LY1FiraSans-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/FiraSans-Sup.]
+ [2019/05/22 (autoinst) Font definitions for LY1/FiraSans-Sup.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LY1}{FiraSans-Sup}{m}{sl}{
- <-> ssub * FiraSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-Sup}{m}{n}{
- <-> ssub * FiraSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-Sup}{m}{it}{
- <-> ssub * FiraSans-Sup/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LY1}{FiraSans-Sup}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{sl}{
- <-> ssub * FiraSans-Sup/extrabold/sl
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{sl}{
+ <-> ssub * FiraSans-Sup/extralight/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{n}{
- <-> ssub * FiraSans-Sup/extrabold/n
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{n}{
+ <-> ssub * FiraSans-Sup/extralight/n
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{it}{
- <-> ssub * FiraSans-Sup/extrabold/it
+\DeclareFontShape{LY1}{FiraSans-Sup}{el}{it}{
+ <-> ssub * FiraSans-Sup/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{sl}{
- <-> ssub * FiraSans-Sup/semibold/sl
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{sl}{
+ <-> ssub * FiraSans-Sup/light/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{n}{
- <-> ssub * FiraSans-Sup/semibold/n
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{n}{
+ <-> ssub * FiraSans-Sup/light/n
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{it}{
- <-> ssub * FiraSans-Sup/semibold/it
+\DeclareFontShape{LY1}{FiraSans-Sup}{l}{it}{
+ <-> ssub * FiraSans-Sup/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{sl}{
- <-> ssub * FiraSans-Sup/heavy/sl
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{sl}{
+ <-> ssub * FiraSans-Sup/regular/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{n}{
- <-> ssub * FiraSans-Sup/heavy/n
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{n}{
+ <-> ssub * FiraSans-Sup/regular/n
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{it}{
- <-> ssub * FiraSans-Sup/heavy/it
+\DeclareFontShape{LY1}{FiraSans-Sup}{m}{it}{
+ <-> ssub * FiraSans-Sup/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LY1}{FiraSans-Sup}{l}{sl}{
- <-> ssub * FiraSans-Sup/light/sl
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{sl}{
+ <-> ssub * FiraSans-Sup/semibold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{l}{n}{
- <-> ssub * FiraSans-Sup/light/n
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{n}{
+ <-> ssub * FiraSans-Sup/semibold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{l}{it}{
- <-> ssub * FiraSans-Sup/light/it
+\DeclareFontShape{LY1}{FiraSans-Sup}{sb}{it}{
+ <-> ssub * FiraSans-Sup/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LY1}{FiraSans-Sup}{el}{sl}{
- <-> ssub * FiraSans-Sup/extralight/sl
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{sl}{
+ <-> ssub * FiraSans-Sup/extrabold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{el}{n}{
- <-> ssub * FiraSans-Sup/extralight/n
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{n}{
+ <-> ssub * FiraSans-Sup/extrabold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-Sup}{el}{it}{
- <-> ssub * FiraSans-Sup/extralight/it
+\DeclareFontShape{LY1}{FiraSans-Sup}{eb}{it}{
+ <-> ssub * FiraSans-Sup/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{sl}{
+ <-> ssub * FiraSans-Sup/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{n}{
+ <-> ssub * FiraSans-Sup/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-Sup}{ub}{it}{
+ <-> ssub * FiraSans-Sup/heavy/it
}{}
\DeclareFontShape{LY1}{FiraSans-Sup}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TLF.fd
index 665c976178f..577cc17aa3f 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LY1FiraSans-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/FiraSans-TLF.]
+ [2019/05/22 (autoinst) Font definitions for LY1/FiraSans-TLF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sl}{
- <-> ssub * FiraSans-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
- <-> ssub * FiraSans-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
- <-> ssub * FiraSans-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
- <-> ssub * FiraSans-TLF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
- <-> ssub * FiraSans-TLF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scit}{
- <-> ssub * FiraSans-TLF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LY1}{FiraSans-TLF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sl}{
- <-> ssub * FiraSans-TLF/extrabold/sl
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sl}{
+ <-> ssub * FiraSans-TLF/extralight/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scsl}{
- <-> ssub * FiraSans-TLF/extrabold/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scsl}{
+ <-> ssub * FiraSans-TLF/extralight/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sc}{
- <-> ssub * FiraSans-TLF/extrabold/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sc}{
+ <-> ssub * FiraSans-TLF/extralight/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{n}{
- <-> ssub * FiraSans-TLF/extrabold/n
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{n}{
+ <-> ssub * FiraSans-TLF/extralight/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{it}{
- <-> ssub * FiraSans-TLF/extrabold/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{it}{
+ <-> ssub * FiraSans-TLF/extralight/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scit}{
- <-> ssub * FiraSans-TLF/extrabold/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scit}{
+ <-> ssub * FiraSans-TLF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sl}{
- <-> ssub * FiraSans-TLF/semibold/sl
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sl}{
+ <-> ssub * FiraSans-TLF/light/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scsl}{
- <-> ssub * FiraSans-TLF/semibold/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scsl}{
+ <-> ssub * FiraSans-TLF/light/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sc}{
- <-> ssub * FiraSans-TLF/semibold/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sc}{
+ <-> ssub * FiraSans-TLF/light/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{n}{
- <-> ssub * FiraSans-TLF/semibold/n
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{n}{
+ <-> ssub * FiraSans-TLF/light/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{it}{
- <-> ssub * FiraSans-TLF/semibold/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{it}{
+ <-> ssub * FiraSans-TLF/light/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scit}{
- <-> ssub * FiraSans-TLF/semibold/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scit}{
+ <-> ssub * FiraSans-TLF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sl}{
- <-> ssub * FiraSans-TLF/heavy/sl
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sl}{
+ <-> ssub * FiraSans-TLF/regular/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scsl}{
- <-> ssub * FiraSans-TLF/heavy/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scsl}{
+ <-> ssub * FiraSans-TLF/regular/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sc}{
- <-> ssub * FiraSans-TLF/heavy/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{sc}{
+ <-> ssub * FiraSans-TLF/regular/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{n}{
- <-> ssub * FiraSans-TLF/heavy/n
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{n}{
+ <-> ssub * FiraSans-TLF/regular/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{it}{
- <-> ssub * FiraSans-TLF/heavy/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{it}{
+ <-> ssub * FiraSans-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scit}{
- <-> ssub * FiraSans-TLF/heavy/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{m}{scit}{
+ <-> ssub * FiraSans-TLF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sl}{
- <-> ssub * FiraSans-TLF/light/sl
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sl}{
+ <-> ssub * FiraSans-TLF/semibold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scsl}{
- <-> ssub * FiraSans-TLF/light/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scsl}{
+ <-> ssub * FiraSans-TLF/semibold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{sc}{
- <-> ssub * FiraSans-TLF/light/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{sc}{
+ <-> ssub * FiraSans-TLF/semibold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{n}{
- <-> ssub * FiraSans-TLF/light/n
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{n}{
+ <-> ssub * FiraSans-TLF/semibold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{it}{
- <-> ssub * FiraSans-TLF/light/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{it}{
+ <-> ssub * FiraSans-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{l}{scit}{
- <-> ssub * FiraSans-TLF/light/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{sb}{scit}{
+ <-> ssub * FiraSans-TLF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sl}{
- <-> ssub * FiraSans-TLF/extralight/sl
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sl}{
+ <-> ssub * FiraSans-TLF/extrabold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scsl}{
- <-> ssub * FiraSans-TLF/extralight/scsl
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scsl}{
+ <-> ssub * FiraSans-TLF/extrabold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{sc}{
- <-> ssub * FiraSans-TLF/extralight/sc
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{sc}{
+ <-> ssub * FiraSans-TLF/extrabold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{n}{
- <-> ssub * FiraSans-TLF/extralight/n
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{n}{
+ <-> ssub * FiraSans-TLF/extrabold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{it}{
- <-> ssub * FiraSans-TLF/extralight/it
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{it}{
+ <-> ssub * FiraSans-TLF/extrabold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TLF}{el}{scit}{
- <-> ssub * FiraSans-TLF/extralight/scit
+\DeclareFontShape{LY1}{FiraSans-TLF}{eb}{scit}{
+ <-> ssub * FiraSans-TLF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sl}{
+ <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scsl}{
+ <-> ssub * FiraSans-TLF/heavy/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{sc}{
+ <-> ssub * FiraSans-TLF/heavy/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{n}{
+ <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{it}{
+ <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TLF}{ub}{scit}{
+ <-> ssub * FiraSans-TLF/heavy/scit
}{}
\DeclareFontShape{LY1}{FiraSans-TLF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/LY1FiraSans-TOsF.fd
index 81bc04fa88e..aa56d33d121 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{LY1FiraSans-TOsF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/FiraSans-TOsF.]
+ [2019/05/22 (autoinst) Font definitions for LY1/FiraSans-TOsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sl}{
- <-> ssub * FiraSans-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scsl}{
- <-> ssub * FiraSans-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sc}{
- <-> ssub * FiraSans-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{n}{
- <-> ssub * FiraSans-TOsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{it}{
- <-> ssub * FiraSans-TOsF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scit}{
- <-> ssub * FiraSans-TOsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{LY1}{FiraSans-TOsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sl}{
- <-> ssub * FiraSans-TOsF/extrabold/sl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sl}{
+ <-> ssub * FiraSans-TOsF/extralight/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scsl}{
- <-> ssub * FiraSans-TOsF/extrabold/scsl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scsl}{
+ <-> ssub * FiraSans-TOsF/extralight/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sc}{
- <-> ssub * FiraSans-TOsF/extrabold/sc
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sc}{
+ <-> ssub * FiraSans-TOsF/extralight/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{n}{
- <-> ssub * FiraSans-TOsF/extrabold/n
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{n}{
+ <-> ssub * FiraSans-TOsF/extralight/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{it}{
- <-> ssub * FiraSans-TOsF/extrabold/it
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{it}{
+ <-> ssub * FiraSans-TOsF/extralight/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scit}{
- <-> ssub * FiraSans-TOsF/extrabold/scit
+\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scit}{
+ <-> ssub * FiraSans-TOsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sl}{
- <-> ssub * FiraSans-TOsF/semibold/sl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sl}{
+ <-> ssub * FiraSans-TOsF/light/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scsl}{
- <-> ssub * FiraSans-TOsF/semibold/scsl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scsl}{
+ <-> ssub * FiraSans-TOsF/light/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sc}{
- <-> ssub * FiraSans-TOsF/semibold/sc
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sc}{
+ <-> ssub * FiraSans-TOsF/light/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{n}{
- <-> ssub * FiraSans-TOsF/semibold/n
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{n}{
+ <-> ssub * FiraSans-TOsF/light/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{it}{
- <-> ssub * FiraSans-TOsF/semibold/it
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{it}{
+ <-> ssub * FiraSans-TOsF/light/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scit}{
- <-> ssub * FiraSans-TOsF/semibold/scit
+\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scit}{
+ <-> ssub * FiraSans-TOsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{sl}{
- <-> ssub * FiraSans-TOsF/heavy/sl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sl}{
+ <-> ssub * FiraSans-TOsF/regular/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{scsl}{
- <-> ssub * FiraSans-TOsF/heavy/scsl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scsl}{
+ <-> ssub * FiraSans-TOsF/regular/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{sc}{
- <-> ssub * FiraSans-TOsF/heavy/sc
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{sc}{
+ <-> ssub * FiraSans-TOsF/regular/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{n}{
- <-> ssub * FiraSans-TOsF/heavy/n
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{n}{
+ <-> ssub * FiraSans-TOsF/regular/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{it}{
- <-> ssub * FiraSans-TOsF/heavy/it
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{it}{
+ <-> ssub * FiraSans-TOsF/regular/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{scit}{
- <-> ssub * FiraSans-TOsF/heavy/scit
+\DeclareFontShape{LY1}{FiraSans-TOsF}{m}{scit}{
+ <-> ssub * FiraSans-TOsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sl}{
- <-> ssub * FiraSans-TOsF/light/sl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sl}{
+ <-> ssub * FiraSans-TOsF/semibold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scsl}{
- <-> ssub * FiraSans-TOsF/light/scsl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scsl}{
+ <-> ssub * FiraSans-TOsF/semibold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{sc}{
- <-> ssub * FiraSans-TOsF/light/sc
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{sc}{
+ <-> ssub * FiraSans-TOsF/semibold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{n}{
- <-> ssub * FiraSans-TOsF/light/n
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{n}{
+ <-> ssub * FiraSans-TOsF/semibold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{it}{
- <-> ssub * FiraSans-TOsF/light/it
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{it}{
+ <-> ssub * FiraSans-TOsF/semibold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{l}{scit}{
- <-> ssub * FiraSans-TOsF/light/scit
+\DeclareFontShape{LY1}{FiraSans-TOsF}{sb}{scit}{
+ <-> ssub * FiraSans-TOsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sl}{
- <-> ssub * FiraSans-TOsF/extralight/sl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sl}{
+ <-> ssub * FiraSans-TOsF/extrabold/sl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scsl}{
- <-> ssub * FiraSans-TOsF/extralight/scsl
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scsl}{
+ <-> ssub * FiraSans-TOsF/extrabold/scsl
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{sc}{
- <-> ssub * FiraSans-TOsF/extralight/sc
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{sc}{
+ <-> ssub * FiraSans-TOsF/extrabold/sc
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{n}{
- <-> ssub * FiraSans-TOsF/extralight/n
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{n}{
+ <-> ssub * FiraSans-TOsF/extrabold/n
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{it}{
- <-> ssub * FiraSans-TOsF/extralight/it
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{it}{
+ <-> ssub * FiraSans-TOsF/extrabold/it
}{}
-\DeclareFontShape{LY1}{FiraSans-TOsF}{el}{scit}{
- <-> ssub * FiraSans-TOsF/extralight/scit
+\DeclareFontShape{LY1}{FiraSans-TOsF}{eb}{scit}{
+ <-> ssub * FiraSans-TOsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{sl}{
+ <-> ssub * FiraSans-TOsF/heavy/sl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{scsl}{
+ <-> ssub * FiraSans-TOsF/heavy/scsl
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{sc}{
+ <-> ssub * FiraSans-TOsF/heavy/sc
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{n}{
+ <-> ssub * FiraSans-TOsF/heavy/n
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{it}{
+ <-> ssub * FiraSans-TOsF/heavy/it
+}{}
+
+\DeclareFontShape{LY1}{FiraSans-TOsF}{ub}{scit}{
+ <-> ssub * FiraSans-TOsF/heavy/scit
}{}
\DeclareFontShape{LY1}{FiraSans-TOsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-LF.fd
index 9de99976ba4..28d6d9fbace 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{OT1FiraSans-LF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/FiraSans-LF.]
+ [2019/05/22 (autoinst) Font definitions for OT1/FiraSans-LF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{sl}{
- <-> ssub * FiraSans-LF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{scsl}{
- <-> ssub * FiraSans-LF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{sc}{
- <-> ssub * FiraSans-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{n}{
- <-> ssub * FiraSans-LF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{it}{
- <-> ssub * FiraSans-LF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-LF}{m}{scit}{
- <-> ssub * FiraSans-LF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{OT1}{FiraSans-LF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sl}{
- <-> ssub * FiraSans-LF/extrabold/sl
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{sl}{
+ <-> ssub * FiraSans-LF/extralight/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scsl}{
- <-> ssub * FiraSans-LF/extrabold/scsl
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{scsl}{
+ <-> ssub * FiraSans-LF/extralight/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sc}{
- <-> ssub * FiraSans-LF/extrabold/sc
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{sc}{
+ <-> ssub * FiraSans-LF/extralight/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{n}{
- <-> ssub * FiraSans-LF/extrabold/n
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{n}{
+ <-> ssub * FiraSans-LF/extralight/n
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{it}{
- <-> ssub * FiraSans-LF/extrabold/it
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{it}{
+ <-> ssub * FiraSans-LF/extralight/it
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scit}{
- <-> ssub * FiraSans-LF/extrabold/scit
+\DeclareFontShape{OT1}{FiraSans-LF}{el}{scit}{
+ <-> ssub * FiraSans-LF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sl}{
- <-> ssub * FiraSans-LF/semibold/sl
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{sl}{
+ <-> ssub * FiraSans-LF/light/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scsl}{
- <-> ssub * FiraSans-LF/semibold/scsl
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{scsl}{
+ <-> ssub * FiraSans-LF/light/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sc}{
- <-> ssub * FiraSans-LF/semibold/sc
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{sc}{
+ <-> ssub * FiraSans-LF/light/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{n}{
- <-> ssub * FiraSans-LF/semibold/n
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{n}{
+ <-> ssub * FiraSans-LF/light/n
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{it}{
- <-> ssub * FiraSans-LF/semibold/it
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{it}{
+ <-> ssub * FiraSans-LF/light/it
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scit}{
- <-> ssub * FiraSans-LF/semibold/scit
+\DeclareFontShape{OT1}{FiraSans-LF}{l}{scit}{
+ <-> ssub * FiraSans-LF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{sl}{
- <-> ssub * FiraSans-LF/heavy/sl
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{sl}{
+ <-> ssub * FiraSans-LF/regular/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{scsl}{
- <-> ssub * FiraSans-LF/heavy/scsl
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{scsl}{
+ <-> ssub * FiraSans-LF/regular/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{sc}{
- <-> ssub * FiraSans-LF/heavy/sc
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{sc}{
+ <-> ssub * FiraSans-LF/regular/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{n}{
- <-> ssub * FiraSans-LF/heavy/n
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{n}{
+ <-> ssub * FiraSans-LF/regular/n
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{it}{
- <-> ssub * FiraSans-LF/heavy/it
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{it}{
+ <-> ssub * FiraSans-LF/regular/it
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{ub}{scit}{
- <-> ssub * FiraSans-LF/heavy/scit
+\DeclareFontShape{OT1}{FiraSans-LF}{m}{scit}{
+ <-> ssub * FiraSans-LF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{sl}{
- <-> ssub * FiraSans-LF/light/sl
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sl}{
+ <-> ssub * FiraSans-LF/semibold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{scsl}{
- <-> ssub * FiraSans-LF/light/scsl
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scsl}{
+ <-> ssub * FiraSans-LF/semibold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{sc}{
- <-> ssub * FiraSans-LF/light/sc
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{sc}{
+ <-> ssub * FiraSans-LF/semibold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{n}{
- <-> ssub * FiraSans-LF/light/n
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{n}{
+ <-> ssub * FiraSans-LF/semibold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{it}{
- <-> ssub * FiraSans-LF/light/it
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{it}{
+ <-> ssub * FiraSans-LF/semibold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{l}{scit}{
- <-> ssub * FiraSans-LF/light/scit
+\DeclareFontShape{OT1}{FiraSans-LF}{sb}{scit}{
+ <-> ssub * FiraSans-LF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{sl}{
- <-> ssub * FiraSans-LF/extralight/sl
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sl}{
+ <-> ssub * FiraSans-LF/extrabold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{scsl}{
- <-> ssub * FiraSans-LF/extralight/scsl
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scsl}{
+ <-> ssub * FiraSans-LF/extrabold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{sc}{
- <-> ssub * FiraSans-LF/extralight/sc
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{sc}{
+ <-> ssub * FiraSans-LF/extrabold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{n}{
- <-> ssub * FiraSans-LF/extralight/n
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{n}{
+ <-> ssub * FiraSans-LF/extrabold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{it}{
- <-> ssub * FiraSans-LF/extralight/it
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{it}{
+ <-> ssub * FiraSans-LF/extrabold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-LF}{el}{scit}{
- <-> ssub * FiraSans-LF/extralight/scit
+\DeclareFontShape{OT1}{FiraSans-LF}{eb}{scit}{
+ <-> ssub * FiraSans-LF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{sl}{
+ <-> ssub * FiraSans-LF/heavy/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{scsl}{
+ <-> ssub * FiraSans-LF/heavy/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{sc}{
+ <-> ssub * FiraSans-LF/heavy/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{n}{
+ <-> ssub * FiraSans-LF/heavy/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{it}{
+ <-> ssub * FiraSans-LF/heavy/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-LF}{ub}{scit}{
+ <-> ssub * FiraSans-LF/heavy/scit
}{}
\DeclareFontShape{OT1}{FiraSans-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-OsF.fd
index 32be719f622..14810ab045f 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{OT1FiraSans-OsF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/FiraSans-OsF.]
+ [2019/05/22 (autoinst) Font definitions for OT1/FiraSans-OsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sl}{
- <-> ssub * FiraSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scsl}{
- <-> ssub * FiraSans-OsF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sc}{
- <-> ssub * FiraSans-OsF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{n}{
- <-> ssub * FiraSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{it}{
- <-> ssub * FiraSans-OsF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scit}{
- <-> ssub * FiraSans-OsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{OT1}{FiraSans-OsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sl}{
- <-> ssub * FiraSans-OsF/extrabold/sl
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sl}{
+ <-> ssub * FiraSans-OsF/extralight/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scsl}{
- <-> ssub * FiraSans-OsF/extrabold/scsl
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scsl}{
+ <-> ssub * FiraSans-OsF/extralight/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sc}{
- <-> ssub * FiraSans-OsF/extrabold/sc
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sc}{
+ <-> ssub * FiraSans-OsF/extralight/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{n}{
- <-> ssub * FiraSans-OsF/extrabold/n
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{n}{
+ <-> ssub * FiraSans-OsF/extralight/n
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{it}{
- <-> ssub * FiraSans-OsF/extrabold/it
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{it}{
+ <-> ssub * FiraSans-OsF/extralight/it
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scit}{
- <-> ssub * FiraSans-OsF/extrabold/scit
+\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scit}{
+ <-> ssub * FiraSans-OsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sl}{
- <-> ssub * FiraSans-OsF/semibold/sl
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sl}{
+ <-> ssub * FiraSans-OsF/light/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scsl}{
- <-> ssub * FiraSans-OsF/semibold/scsl
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scsl}{
+ <-> ssub * FiraSans-OsF/light/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sc}{
- <-> ssub * FiraSans-OsF/semibold/sc
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sc}{
+ <-> ssub * FiraSans-OsF/light/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{n}{
- <-> ssub * FiraSans-OsF/semibold/n
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{n}{
+ <-> ssub * FiraSans-OsF/light/n
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{it}{
- <-> ssub * FiraSans-OsF/semibold/it
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{it}{
+ <-> ssub * FiraSans-OsF/light/it
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scit}{
- <-> ssub * FiraSans-OsF/semibold/scit
+\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scit}{
+ <-> ssub * FiraSans-OsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{sl}{
- <-> ssub * FiraSans-OsF/heavy/sl
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sl}{
+ <-> ssub * FiraSans-OsF/regular/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{scsl}{
- <-> ssub * FiraSans-OsF/heavy/scsl
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scsl}{
+ <-> ssub * FiraSans-OsF/regular/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{sc}{
- <-> ssub * FiraSans-OsF/heavy/sc
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{sc}{
+ <-> ssub * FiraSans-OsF/regular/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{n}{
- <-> ssub * FiraSans-OsF/heavy/n
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{n}{
+ <-> ssub * FiraSans-OsF/regular/n
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{it}{
- <-> ssub * FiraSans-OsF/heavy/it
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{it}{
+ <-> ssub * FiraSans-OsF/regular/it
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{scit}{
- <-> ssub * FiraSans-OsF/heavy/scit
+\DeclareFontShape{OT1}{FiraSans-OsF}{m}{scit}{
+ <-> ssub * FiraSans-OsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sl}{
- <-> ssub * FiraSans-OsF/light/sl
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sl}{
+ <-> ssub * FiraSans-OsF/semibold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scsl}{
- <-> ssub * FiraSans-OsF/light/scsl
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scsl}{
+ <-> ssub * FiraSans-OsF/semibold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{sc}{
- <-> ssub * FiraSans-OsF/light/sc
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{sc}{
+ <-> ssub * FiraSans-OsF/semibold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{n}{
- <-> ssub * FiraSans-OsF/light/n
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{n}{
+ <-> ssub * FiraSans-OsF/semibold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{it}{
- <-> ssub * FiraSans-OsF/light/it
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{it}{
+ <-> ssub * FiraSans-OsF/semibold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{l}{scit}{
- <-> ssub * FiraSans-OsF/light/scit
+\DeclareFontShape{OT1}{FiraSans-OsF}{sb}{scit}{
+ <-> ssub * FiraSans-OsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sl}{
- <-> ssub * FiraSans-OsF/extralight/sl
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sl}{
+ <-> ssub * FiraSans-OsF/extrabold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scsl}{
- <-> ssub * FiraSans-OsF/extralight/scsl
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scsl}{
+ <-> ssub * FiraSans-OsF/extrabold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{sc}{
- <-> ssub * FiraSans-OsF/extralight/sc
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{sc}{
+ <-> ssub * FiraSans-OsF/extrabold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{n}{
- <-> ssub * FiraSans-OsF/extralight/n
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{n}{
+ <-> ssub * FiraSans-OsF/extrabold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{it}{
- <-> ssub * FiraSans-OsF/extralight/it
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{it}{
+ <-> ssub * FiraSans-OsF/extrabold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-OsF}{el}{scit}{
- <-> ssub * FiraSans-OsF/extralight/scit
+\DeclareFontShape{OT1}{FiraSans-OsF}{eb}{scit}{
+ <-> ssub * FiraSans-OsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{sl}{
+ <-> ssub * FiraSans-OsF/heavy/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{scsl}{
+ <-> ssub * FiraSans-OsF/heavy/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{sc}{
+ <-> ssub * FiraSans-OsF/heavy/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{n}{
+ <-> ssub * FiraSans-OsF/heavy/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{it}{
+ <-> ssub * FiraSans-OsF/heavy/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-OsF}{ub}{scit}{
+ <-> ssub * FiraSans-OsF/heavy/scit
}{}
\DeclareFontShape{OT1}{FiraSans-OsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-Sup.fd
index 7f3798a5581..ca6be4a01ae 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{OT1FiraSans-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/FiraSans-Sup.]
+ [2019/05/22 (autoinst) Font definitions for OT1/FiraSans-Sup.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{OT1}{FiraSans-Sup}{m}{sl}{
- <-> ssub * FiraSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-Sup}{m}{n}{
- <-> ssub * FiraSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-Sup}{m}{it}{
- <-> ssub * FiraSans-Sup/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{OT1}{FiraSans-Sup}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{sl}{
- <-> ssub * FiraSans-Sup/extrabold/sl
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{sl}{
+ <-> ssub * FiraSans-Sup/extralight/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{n}{
- <-> ssub * FiraSans-Sup/extrabold/n
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{n}{
+ <-> ssub * FiraSans-Sup/extralight/n
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{it}{
- <-> ssub * FiraSans-Sup/extrabold/it
+\DeclareFontShape{OT1}{FiraSans-Sup}{el}{it}{
+ <-> ssub * FiraSans-Sup/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{sl}{
- <-> ssub * FiraSans-Sup/semibold/sl
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{sl}{
+ <-> ssub * FiraSans-Sup/light/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{n}{
- <-> ssub * FiraSans-Sup/semibold/n
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{n}{
+ <-> ssub * FiraSans-Sup/light/n
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{it}{
- <-> ssub * FiraSans-Sup/semibold/it
+\DeclareFontShape{OT1}{FiraSans-Sup}{l}{it}{
+ <-> ssub * FiraSans-Sup/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{sl}{
- <-> ssub * FiraSans-Sup/heavy/sl
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{sl}{
+ <-> ssub * FiraSans-Sup/regular/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{n}{
- <-> ssub * FiraSans-Sup/heavy/n
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{n}{
+ <-> ssub * FiraSans-Sup/regular/n
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{it}{
- <-> ssub * FiraSans-Sup/heavy/it
+\DeclareFontShape{OT1}{FiraSans-Sup}{m}{it}{
+ <-> ssub * FiraSans-Sup/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{OT1}{FiraSans-Sup}{l}{sl}{
- <-> ssub * FiraSans-Sup/light/sl
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{sl}{
+ <-> ssub * FiraSans-Sup/semibold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{l}{n}{
- <-> ssub * FiraSans-Sup/light/n
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{n}{
+ <-> ssub * FiraSans-Sup/semibold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{l}{it}{
- <-> ssub * FiraSans-Sup/light/it
+\DeclareFontShape{OT1}{FiraSans-Sup}{sb}{it}{
+ <-> ssub * FiraSans-Sup/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{OT1}{FiraSans-Sup}{el}{sl}{
- <-> ssub * FiraSans-Sup/extralight/sl
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{sl}{
+ <-> ssub * FiraSans-Sup/extrabold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{el}{n}{
- <-> ssub * FiraSans-Sup/extralight/n
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{n}{
+ <-> ssub * FiraSans-Sup/extrabold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-Sup}{el}{it}{
- <-> ssub * FiraSans-Sup/extralight/it
+\DeclareFontShape{OT1}{FiraSans-Sup}{eb}{it}{
+ <-> ssub * FiraSans-Sup/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{sl}{
+ <-> ssub * FiraSans-Sup/heavy/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{n}{
+ <-> ssub * FiraSans-Sup/heavy/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-Sup}{ub}{it}{
+ <-> ssub * FiraSans-Sup/heavy/it
}{}
\DeclareFontShape{OT1}{FiraSans-Sup}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TLF.fd
index b335346755c..5840d885d88 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{OT1FiraSans-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/FiraSans-TLF.]
+ [2019/05/22 (autoinst) Font definitions for OT1/FiraSans-TLF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sl}{
- <-> ssub * FiraSans-TLF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scsl}{
- <-> ssub * FiraSans-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sc}{
- <-> ssub * FiraSans-TLF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{n}{
- <-> ssub * FiraSans-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{it}{
- <-> ssub * FiraSans-TLF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scit}{
- <-> ssub * FiraSans-TLF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{OT1}{FiraSans-TLF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sl}{
- <-> ssub * FiraSans-TLF/extrabold/sl
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sl}{
+ <-> ssub * FiraSans-TLF/extralight/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scsl}{
- <-> ssub * FiraSans-TLF/extrabold/scsl
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scsl}{
+ <-> ssub * FiraSans-TLF/extralight/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sc}{
- <-> ssub * FiraSans-TLF/extrabold/sc
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sc}{
+ <-> ssub * FiraSans-TLF/extralight/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{n}{
- <-> ssub * FiraSans-TLF/extrabold/n
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{n}{
+ <-> ssub * FiraSans-TLF/extralight/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{it}{
- <-> ssub * FiraSans-TLF/extrabold/it
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{it}{
+ <-> ssub * FiraSans-TLF/extralight/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scit}{
- <-> ssub * FiraSans-TLF/extrabold/scit
+\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scit}{
+ <-> ssub * FiraSans-TLF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sl}{
- <-> ssub * FiraSans-TLF/semibold/sl
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sl}{
+ <-> ssub * FiraSans-TLF/light/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scsl}{
- <-> ssub * FiraSans-TLF/semibold/scsl
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scsl}{
+ <-> ssub * FiraSans-TLF/light/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sc}{
- <-> ssub * FiraSans-TLF/semibold/sc
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sc}{
+ <-> ssub * FiraSans-TLF/light/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{n}{
- <-> ssub * FiraSans-TLF/semibold/n
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{n}{
+ <-> ssub * FiraSans-TLF/light/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{it}{
- <-> ssub * FiraSans-TLF/semibold/it
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{it}{
+ <-> ssub * FiraSans-TLF/light/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scit}{
- <-> ssub * FiraSans-TLF/semibold/scit
+\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scit}{
+ <-> ssub * FiraSans-TLF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{sl}{
- <-> ssub * FiraSans-TLF/heavy/sl
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sl}{
+ <-> ssub * FiraSans-TLF/regular/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{scsl}{
- <-> ssub * FiraSans-TLF/heavy/scsl
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scsl}{
+ <-> ssub * FiraSans-TLF/regular/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{sc}{
- <-> ssub * FiraSans-TLF/heavy/sc
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{sc}{
+ <-> ssub * FiraSans-TLF/regular/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{n}{
- <-> ssub * FiraSans-TLF/heavy/n
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{n}{
+ <-> ssub * FiraSans-TLF/regular/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{it}{
- <-> ssub * FiraSans-TLF/heavy/it
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{it}{
+ <-> ssub * FiraSans-TLF/regular/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{scit}{
- <-> ssub * FiraSans-TLF/heavy/scit
+\DeclareFontShape{OT1}{FiraSans-TLF}{m}{scit}{
+ <-> ssub * FiraSans-TLF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sl}{
- <-> ssub * FiraSans-TLF/light/sl
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sl}{
+ <-> ssub * FiraSans-TLF/semibold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scsl}{
- <-> ssub * FiraSans-TLF/light/scsl
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scsl}{
+ <-> ssub * FiraSans-TLF/semibold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{sc}{
- <-> ssub * FiraSans-TLF/light/sc
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{sc}{
+ <-> ssub * FiraSans-TLF/semibold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{n}{
- <-> ssub * FiraSans-TLF/light/n
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{n}{
+ <-> ssub * FiraSans-TLF/semibold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{it}{
- <-> ssub * FiraSans-TLF/light/it
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{it}{
+ <-> ssub * FiraSans-TLF/semibold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{l}{scit}{
- <-> ssub * FiraSans-TLF/light/scit
+\DeclareFontShape{OT1}{FiraSans-TLF}{sb}{scit}{
+ <-> ssub * FiraSans-TLF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sl}{
- <-> ssub * FiraSans-TLF/extralight/sl
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sl}{
+ <-> ssub * FiraSans-TLF/extrabold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scsl}{
- <-> ssub * FiraSans-TLF/extralight/scsl
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scsl}{
+ <-> ssub * FiraSans-TLF/extrabold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{sc}{
- <-> ssub * FiraSans-TLF/extralight/sc
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{sc}{
+ <-> ssub * FiraSans-TLF/extrabold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{n}{
- <-> ssub * FiraSans-TLF/extralight/n
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{n}{
+ <-> ssub * FiraSans-TLF/extrabold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{it}{
- <-> ssub * FiraSans-TLF/extralight/it
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{it}{
+ <-> ssub * FiraSans-TLF/extrabold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TLF}{el}{scit}{
- <-> ssub * FiraSans-TLF/extralight/scit
+\DeclareFontShape{OT1}{FiraSans-TLF}{eb}{scit}{
+ <-> ssub * FiraSans-TLF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{sl}{
+ <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{scsl}{
+ <-> ssub * FiraSans-TLF/heavy/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{sc}{
+ <-> ssub * FiraSans-TLF/heavy/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{n}{
+ <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{it}{
+ <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TLF}{ub}{scit}{
+ <-> ssub * FiraSans-TLF/heavy/scit
}{}
\DeclareFontShape{OT1}{FiraSans-TLF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/OT1FiraSans-TOsF.fd
index de6ae677053..97ac97441f7 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{OT1FiraSans-TOsF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/FiraSans-TOsF.]
+ [2019/05/22 (autoinst) Font definitions for OT1/FiraSans-TOsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sl}{
- <-> ssub * FiraSans-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scsl}{
- <-> ssub * FiraSans-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sc}{
- <-> ssub * FiraSans-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{n}{
- <-> ssub * FiraSans-TOsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{it}{
- <-> ssub * FiraSans-TOsF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scit}{
- <-> ssub * FiraSans-TOsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{OT1}{FiraSans-TOsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sl}{
- <-> ssub * FiraSans-TOsF/extrabold/sl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sl}{
+ <-> ssub * FiraSans-TOsF/extralight/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scsl}{
- <-> ssub * FiraSans-TOsF/extrabold/scsl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scsl}{
+ <-> ssub * FiraSans-TOsF/extralight/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sc}{
- <-> ssub * FiraSans-TOsF/extrabold/sc
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sc}{
+ <-> ssub * FiraSans-TOsF/extralight/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{n}{
- <-> ssub * FiraSans-TOsF/extrabold/n
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{n}{
+ <-> ssub * FiraSans-TOsF/extralight/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{it}{
- <-> ssub * FiraSans-TOsF/extrabold/it
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{it}{
+ <-> ssub * FiraSans-TOsF/extralight/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scit}{
- <-> ssub * FiraSans-TOsF/extrabold/scit
+\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scit}{
+ <-> ssub * FiraSans-TOsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sl}{
- <-> ssub * FiraSans-TOsF/semibold/sl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sl}{
+ <-> ssub * FiraSans-TOsF/light/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scsl}{
- <-> ssub * FiraSans-TOsF/semibold/scsl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scsl}{
+ <-> ssub * FiraSans-TOsF/light/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sc}{
- <-> ssub * FiraSans-TOsF/semibold/sc
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sc}{
+ <-> ssub * FiraSans-TOsF/light/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{n}{
- <-> ssub * FiraSans-TOsF/semibold/n
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{n}{
+ <-> ssub * FiraSans-TOsF/light/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{it}{
- <-> ssub * FiraSans-TOsF/semibold/it
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{it}{
+ <-> ssub * FiraSans-TOsF/light/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scit}{
- <-> ssub * FiraSans-TOsF/semibold/scit
+\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scit}{
+ <-> ssub * FiraSans-TOsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{sl}{
- <-> ssub * FiraSans-TOsF/heavy/sl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sl}{
+ <-> ssub * FiraSans-TOsF/regular/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{scsl}{
- <-> ssub * FiraSans-TOsF/heavy/scsl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scsl}{
+ <-> ssub * FiraSans-TOsF/regular/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{sc}{
- <-> ssub * FiraSans-TOsF/heavy/sc
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{sc}{
+ <-> ssub * FiraSans-TOsF/regular/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{n}{
- <-> ssub * FiraSans-TOsF/heavy/n
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{n}{
+ <-> ssub * FiraSans-TOsF/regular/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{it}{
- <-> ssub * FiraSans-TOsF/heavy/it
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{it}{
+ <-> ssub * FiraSans-TOsF/regular/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{scit}{
- <-> ssub * FiraSans-TOsF/heavy/scit
+\DeclareFontShape{OT1}{FiraSans-TOsF}{m}{scit}{
+ <-> ssub * FiraSans-TOsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sl}{
- <-> ssub * FiraSans-TOsF/light/sl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sl}{
+ <-> ssub * FiraSans-TOsF/semibold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scsl}{
- <-> ssub * FiraSans-TOsF/light/scsl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scsl}{
+ <-> ssub * FiraSans-TOsF/semibold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{sc}{
- <-> ssub * FiraSans-TOsF/light/sc
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{sc}{
+ <-> ssub * FiraSans-TOsF/semibold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{n}{
- <-> ssub * FiraSans-TOsF/light/n
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{n}{
+ <-> ssub * FiraSans-TOsF/semibold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{it}{
- <-> ssub * FiraSans-TOsF/light/it
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{it}{
+ <-> ssub * FiraSans-TOsF/semibold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{l}{scit}{
- <-> ssub * FiraSans-TOsF/light/scit
+\DeclareFontShape{OT1}{FiraSans-TOsF}{sb}{scit}{
+ <-> ssub * FiraSans-TOsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sl}{
- <-> ssub * FiraSans-TOsF/extralight/sl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sl}{
+ <-> ssub * FiraSans-TOsF/extrabold/sl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scsl}{
- <-> ssub * FiraSans-TOsF/extralight/scsl
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scsl}{
+ <-> ssub * FiraSans-TOsF/extrabold/scsl
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{sc}{
- <-> ssub * FiraSans-TOsF/extralight/sc
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{sc}{
+ <-> ssub * FiraSans-TOsF/extrabold/sc
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{n}{
- <-> ssub * FiraSans-TOsF/extralight/n
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{n}{
+ <-> ssub * FiraSans-TOsF/extrabold/n
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{it}{
- <-> ssub * FiraSans-TOsF/extralight/it
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{it}{
+ <-> ssub * FiraSans-TOsF/extrabold/it
}{}
-\DeclareFontShape{OT1}{FiraSans-TOsF}{el}{scit}{
- <-> ssub * FiraSans-TOsF/extralight/scit
+\DeclareFontShape{OT1}{FiraSans-TOsF}{eb}{scit}{
+ <-> ssub * FiraSans-TOsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{sl}{
+ <-> ssub * FiraSans-TOsF/heavy/sl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{scsl}{
+ <-> ssub * FiraSans-TOsF/heavy/scsl
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{sc}{
+ <-> ssub * FiraSans-TOsF/heavy/sc
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{n}{
+ <-> ssub * FiraSans-TOsF/heavy/n
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{it}{
+ <-> ssub * FiraSans-TOsF/heavy/it
+}{}
+
+\DeclareFontShape{OT1}{FiraSans-TOsF}{ub}{scit}{
+ <-> ssub * FiraSans-TOsF/heavy/scit
}{}
\DeclareFontShape{OT1}{FiraSans-TOsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-LF.fd
index 92337b65881..417d5d778e3 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{T1FiraSans-LF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/FiraSans-LF.]
+ [2019/05/22 (autoinst) Font definitions for T1/FiraSans-LF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{sl}{
- <-> ssub * FiraSans-LF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{scsl}{
- <-> ssub * FiraSans-LF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{sc}{
- <-> ssub * FiraSans-LF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{n}{
- <-> ssub * FiraSans-LF/regular/n
-}{}
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{it}{
- <-> ssub * FiraSans-LF/regular/it
-}{}
-
-\DeclareFontShape{T1}{FiraSans-LF}{m}{scit}{
- <-> ssub * FiraSans-LF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{T1}{FiraSans-LF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{sl}{
- <-> ssub * FiraSans-LF/extrabold/sl
+\DeclareFontShape{T1}{FiraSans-LF}{el}{sl}{
+ <-> ssub * FiraSans-LF/extralight/sl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{scsl}{
- <-> ssub * FiraSans-LF/extrabold/scsl
+\DeclareFontShape{T1}{FiraSans-LF}{el}{scsl}{
+ <-> ssub * FiraSans-LF/extralight/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{sc}{
- <-> ssub * FiraSans-LF/extrabold/sc
+\DeclareFontShape{T1}{FiraSans-LF}{el}{sc}{
+ <-> ssub * FiraSans-LF/extralight/sc
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{n}{
- <-> ssub * FiraSans-LF/extrabold/n
+\DeclareFontShape{T1}{FiraSans-LF}{el}{n}{
+ <-> ssub * FiraSans-LF/extralight/n
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{it}{
- <-> ssub * FiraSans-LF/extrabold/it
+\DeclareFontShape{T1}{FiraSans-LF}{el}{it}{
+ <-> ssub * FiraSans-LF/extralight/it
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{eb}{scit}{
- <-> ssub * FiraSans-LF/extrabold/scit
+\DeclareFontShape{T1}{FiraSans-LF}{el}{scit}{
+ <-> ssub * FiraSans-LF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{sl}{
- <-> ssub * FiraSans-LF/semibold/sl
+\DeclareFontShape{T1}{FiraSans-LF}{l}{sl}{
+ <-> ssub * FiraSans-LF/light/sl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{scsl}{
- <-> ssub * FiraSans-LF/semibold/scsl
+\DeclareFontShape{T1}{FiraSans-LF}{l}{scsl}{
+ <-> ssub * FiraSans-LF/light/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{sc}{
- <-> ssub * FiraSans-LF/semibold/sc
+\DeclareFontShape{T1}{FiraSans-LF}{l}{sc}{
+ <-> ssub * FiraSans-LF/light/sc
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{n}{
- <-> ssub * FiraSans-LF/semibold/n
+\DeclareFontShape{T1}{FiraSans-LF}{l}{n}{
+ <-> ssub * FiraSans-LF/light/n
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{it}{
- <-> ssub * FiraSans-LF/semibold/it
+\DeclareFontShape{T1}{FiraSans-LF}{l}{it}{
+ <-> ssub * FiraSans-LF/light/it
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{sb}{scit}{
- <-> ssub * FiraSans-LF/semibold/scit
+\DeclareFontShape{T1}{FiraSans-LF}{l}{scit}{
+ <-> ssub * FiraSans-LF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{sl}{
- <-> ssub * FiraSans-LF/heavy/sl
+\DeclareFontShape{T1}{FiraSans-LF}{m}{sl}{
+ <-> ssub * FiraSans-LF/regular/sl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{scsl}{
- <-> ssub * FiraSans-LF/heavy/scsl
+\DeclareFontShape{T1}{FiraSans-LF}{m}{scsl}{
+ <-> ssub * FiraSans-LF/regular/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{sc}{
- <-> ssub * FiraSans-LF/heavy/sc
+\DeclareFontShape{T1}{FiraSans-LF}{m}{sc}{
+ <-> ssub * FiraSans-LF/regular/sc
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{n}{
- <-> ssub * FiraSans-LF/heavy/n
+\DeclareFontShape{T1}{FiraSans-LF}{m}{n}{
+ <-> ssub * FiraSans-LF/regular/n
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{it}{
- <-> ssub * FiraSans-LF/heavy/it
+\DeclareFontShape{T1}{FiraSans-LF}{m}{it}{
+ <-> ssub * FiraSans-LF/regular/it
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{ub}{scit}{
- <-> ssub * FiraSans-LF/heavy/scit
+\DeclareFontShape{T1}{FiraSans-LF}{m}{scit}{
+ <-> ssub * FiraSans-LF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{T1}{FiraSans-LF}{l}{sl}{
- <-> ssub * FiraSans-LF/light/sl
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{sl}{
+ <-> ssub * FiraSans-LF/semibold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{l}{scsl}{
- <-> ssub * FiraSans-LF/light/scsl
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{scsl}{
+ <-> ssub * FiraSans-LF/semibold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{l}{sc}{
- <-> ssub * FiraSans-LF/light/sc
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{sc}{
+ <-> ssub * FiraSans-LF/semibold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{l}{n}{
- <-> ssub * FiraSans-LF/light/n
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{n}{
+ <-> ssub * FiraSans-LF/semibold/n
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{l}{it}{
- <-> ssub * FiraSans-LF/light/it
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{it}{
+ <-> ssub * FiraSans-LF/semibold/it
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{l}{scit}{
- <-> ssub * FiraSans-LF/light/scit
+\DeclareFontShape{T1}{FiraSans-LF}{sb}{scit}{
+ <-> ssub * FiraSans-LF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{T1}{FiraSans-LF}{el}{sl}{
- <-> ssub * FiraSans-LF/extralight/sl
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{sl}{
+ <-> ssub * FiraSans-LF/extrabold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{el}{scsl}{
- <-> ssub * FiraSans-LF/extralight/scsl
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{scsl}{
+ <-> ssub * FiraSans-LF/extrabold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{el}{sc}{
- <-> ssub * FiraSans-LF/extralight/sc
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{sc}{
+ <-> ssub * FiraSans-LF/extrabold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{el}{n}{
- <-> ssub * FiraSans-LF/extralight/n
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{n}{
+ <-> ssub * FiraSans-LF/extrabold/n
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{el}{it}{
- <-> ssub * FiraSans-LF/extralight/it
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{it}{
+ <-> ssub * FiraSans-LF/extrabold/it
}{}
-\DeclareFontShape{T1}{FiraSans-LF}{el}{scit}{
- <-> ssub * FiraSans-LF/extralight/scit
+\DeclareFontShape{T1}{FiraSans-LF}{eb}{scit}{
+ <-> ssub * FiraSans-LF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{sl}{
+ <-> ssub * FiraSans-LF/heavy/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{scsl}{
+ <-> ssub * FiraSans-LF/heavy/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{sc}{
+ <-> ssub * FiraSans-LF/heavy/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{n}{
+ <-> ssub * FiraSans-LF/heavy/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{it}{
+ <-> ssub * FiraSans-LF/heavy/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-LF}{ub}{scit}{
+ <-> ssub * FiraSans-LF/heavy/scit
}{}
\DeclareFontShape{T1}{FiraSans-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-OsF.fd
index cb2b7901b26..c772311a74c 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{T1FiraSans-OsF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/FiraSans-OsF.]
+ [2019/05/22 (autoinst) Font definitions for T1/FiraSans-OsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{sl}{
- <-> ssub * FiraSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{scsl}{
- <-> ssub * FiraSans-OsF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{sc}{
- <-> ssub * FiraSans-OsF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{n}{
- <-> ssub * FiraSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{it}{
- <-> ssub * FiraSans-OsF/regular/it
-}{}
-
-\DeclareFontShape{T1}{FiraSans-OsF}{m}{scit}{
- <-> ssub * FiraSans-OsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{T1}{FiraSans-OsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sl}{
- <-> ssub * FiraSans-OsF/extrabold/sl
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{sl}{
+ <-> ssub * FiraSans-OsF/extralight/sl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scsl}{
- <-> ssub * FiraSans-OsF/extrabold/scsl
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{scsl}{
+ <-> ssub * FiraSans-OsF/extralight/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sc}{
- <-> ssub * FiraSans-OsF/extrabold/sc
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{sc}{
+ <-> ssub * FiraSans-OsF/extralight/sc
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{n}{
- <-> ssub * FiraSans-OsF/extrabold/n
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{n}{
+ <-> ssub * FiraSans-OsF/extralight/n
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{it}{
- <-> ssub * FiraSans-OsF/extrabold/it
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{it}{
+ <-> ssub * FiraSans-OsF/extralight/it
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scit}{
- <-> ssub * FiraSans-OsF/extrabold/scit
+\DeclareFontShape{T1}{FiraSans-OsF}{el}{scit}{
+ <-> ssub * FiraSans-OsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sl}{
- <-> ssub * FiraSans-OsF/semibold/sl
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{sl}{
+ <-> ssub * FiraSans-OsF/light/sl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scsl}{
- <-> ssub * FiraSans-OsF/semibold/scsl
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{scsl}{
+ <-> ssub * FiraSans-OsF/light/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sc}{
- <-> ssub * FiraSans-OsF/semibold/sc
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{sc}{
+ <-> ssub * FiraSans-OsF/light/sc
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{n}{
- <-> ssub * FiraSans-OsF/semibold/n
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{n}{
+ <-> ssub * FiraSans-OsF/light/n
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{it}{
- <-> ssub * FiraSans-OsF/semibold/it
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{it}{
+ <-> ssub * FiraSans-OsF/light/it
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scit}{
- <-> ssub * FiraSans-OsF/semibold/scit
+\DeclareFontShape{T1}{FiraSans-OsF}{l}{scit}{
+ <-> ssub * FiraSans-OsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{sl}{
- <-> ssub * FiraSans-OsF/heavy/sl
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{sl}{
+ <-> ssub * FiraSans-OsF/regular/sl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{scsl}{
- <-> ssub * FiraSans-OsF/heavy/scsl
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{scsl}{
+ <-> ssub * FiraSans-OsF/regular/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{sc}{
- <-> ssub * FiraSans-OsF/heavy/sc
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{sc}{
+ <-> ssub * FiraSans-OsF/regular/sc
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{n}{
- <-> ssub * FiraSans-OsF/heavy/n
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{n}{
+ <-> ssub * FiraSans-OsF/regular/n
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{it}{
- <-> ssub * FiraSans-OsF/heavy/it
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{it}{
+ <-> ssub * FiraSans-OsF/regular/it
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{ub}{scit}{
- <-> ssub * FiraSans-OsF/heavy/scit
+\DeclareFontShape{T1}{FiraSans-OsF}{m}{scit}{
+ <-> ssub * FiraSans-OsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{sl}{
- <-> ssub * FiraSans-OsF/light/sl
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sl}{
+ <-> ssub * FiraSans-OsF/semibold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{scsl}{
- <-> ssub * FiraSans-OsF/light/scsl
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scsl}{
+ <-> ssub * FiraSans-OsF/semibold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{sc}{
- <-> ssub * FiraSans-OsF/light/sc
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{sc}{
+ <-> ssub * FiraSans-OsF/semibold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{n}{
- <-> ssub * FiraSans-OsF/light/n
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{n}{
+ <-> ssub * FiraSans-OsF/semibold/n
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{it}{
- <-> ssub * FiraSans-OsF/light/it
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{it}{
+ <-> ssub * FiraSans-OsF/semibold/it
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{l}{scit}{
- <-> ssub * FiraSans-OsF/light/scit
+\DeclareFontShape{T1}{FiraSans-OsF}{sb}{scit}{
+ <-> ssub * FiraSans-OsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{sl}{
- <-> ssub * FiraSans-OsF/extralight/sl
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sl}{
+ <-> ssub * FiraSans-OsF/extrabold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{scsl}{
- <-> ssub * FiraSans-OsF/extralight/scsl
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scsl}{
+ <-> ssub * FiraSans-OsF/extrabold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{sc}{
- <-> ssub * FiraSans-OsF/extralight/sc
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{sc}{
+ <-> ssub * FiraSans-OsF/extrabold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{n}{
- <-> ssub * FiraSans-OsF/extralight/n
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{n}{
+ <-> ssub * FiraSans-OsF/extrabold/n
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{it}{
- <-> ssub * FiraSans-OsF/extralight/it
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{it}{
+ <-> ssub * FiraSans-OsF/extrabold/it
}{}
-\DeclareFontShape{T1}{FiraSans-OsF}{el}{scit}{
- <-> ssub * FiraSans-OsF/extralight/scit
+\DeclareFontShape{T1}{FiraSans-OsF}{eb}{scit}{
+ <-> ssub * FiraSans-OsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{sl}{
+ <-> ssub * FiraSans-OsF/heavy/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{scsl}{
+ <-> ssub * FiraSans-OsF/heavy/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{sc}{
+ <-> ssub * FiraSans-OsF/heavy/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{n}{
+ <-> ssub * FiraSans-OsF/heavy/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{it}{
+ <-> ssub * FiraSans-OsF/heavy/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-OsF}{ub}{scit}{
+ <-> ssub * FiraSans-OsF/heavy/scit
}{}
\DeclareFontShape{T1}{FiraSans-OsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-Sup.fd
index ae75e6a762f..d74f90bde39 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{T1FiraSans-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for T1/FiraSans-Sup.]
+ [2019/05/22 (autoinst) Font definitions for T1/FiraSans-Sup.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{T1}{FiraSans-Sup}{m}{sl}{
- <-> ssub * FiraSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-Sup}{m}{n}{
- <-> ssub * FiraSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{FiraSans-Sup}{m}{it}{
- <-> ssub * FiraSans-Sup/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{T1}{FiraSans-Sup}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{T1}{FiraSans-Sup}{eb}{sl}{
- <-> ssub * FiraSans-Sup/extrabold/sl
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{sl}{
+ <-> ssub * FiraSans-Sup/extralight/sl
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{eb}{n}{
- <-> ssub * FiraSans-Sup/extrabold/n
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{n}{
+ <-> ssub * FiraSans-Sup/extralight/n
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{eb}{it}{
- <-> ssub * FiraSans-Sup/extrabold/it
+\DeclareFontShape{T1}{FiraSans-Sup}{el}{it}{
+ <-> ssub * FiraSans-Sup/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{T1}{FiraSans-Sup}{sb}{sl}{
- <-> ssub * FiraSans-Sup/semibold/sl
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{sl}{
+ <-> ssub * FiraSans-Sup/light/sl
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{sb}{n}{
- <-> ssub * FiraSans-Sup/semibold/n
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{n}{
+ <-> ssub * FiraSans-Sup/light/n
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{sb}{it}{
- <-> ssub * FiraSans-Sup/semibold/it
+\DeclareFontShape{T1}{FiraSans-Sup}{l}{it}{
+ <-> ssub * FiraSans-Sup/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{T1}{FiraSans-Sup}{ub}{sl}{
- <-> ssub * FiraSans-Sup/heavy/sl
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{sl}{
+ <-> ssub * FiraSans-Sup/regular/sl
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{ub}{n}{
- <-> ssub * FiraSans-Sup/heavy/n
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{n}{
+ <-> ssub * FiraSans-Sup/regular/n
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{ub}{it}{
- <-> ssub * FiraSans-Sup/heavy/it
+\DeclareFontShape{T1}{FiraSans-Sup}{m}{it}{
+ <-> ssub * FiraSans-Sup/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{T1}{FiraSans-Sup}{l}{sl}{
- <-> ssub * FiraSans-Sup/light/sl
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{sl}{
+ <-> ssub * FiraSans-Sup/semibold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{l}{n}{
- <-> ssub * FiraSans-Sup/light/n
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{n}{
+ <-> ssub * FiraSans-Sup/semibold/n
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{l}{it}{
- <-> ssub * FiraSans-Sup/light/it
+\DeclareFontShape{T1}{FiraSans-Sup}{sb}{it}{
+ <-> ssub * FiraSans-Sup/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{T1}{FiraSans-Sup}{el}{sl}{
- <-> ssub * FiraSans-Sup/extralight/sl
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{sl}{
+ <-> ssub * FiraSans-Sup/extrabold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{el}{n}{
- <-> ssub * FiraSans-Sup/extralight/n
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{n}{
+ <-> ssub * FiraSans-Sup/extrabold/n
}{}
-\DeclareFontShape{T1}{FiraSans-Sup}{el}{it}{
- <-> ssub * FiraSans-Sup/extralight/it
+\DeclareFontShape{T1}{FiraSans-Sup}{eb}{it}{
+ <-> ssub * FiraSans-Sup/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ub}{sl}{
+ <-> ssub * FiraSans-Sup/heavy/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ub}{n}{
+ <-> ssub * FiraSans-Sup/heavy/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-Sup}{ub}{it}{
+ <-> ssub * FiraSans-Sup/heavy/it
}{}
\DeclareFontShape{T1}{FiraSans-Sup}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TLF.fd
index 500b8c2a8c6..0c9fa4ac16e 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{T1FiraSans-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/FiraSans-TLF.]
+ [2019/05/22 (autoinst) Font definitions for T1/FiraSans-TLF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{sl}{
- <-> ssub * FiraSans-TLF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{scsl}{
- <-> ssub * FiraSans-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{sc}{
- <-> ssub * FiraSans-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{n}{
- <-> ssub * FiraSans-TLF/regular/n
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{it}{
- <-> ssub * FiraSans-TLF/regular/it
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TLF}{m}{scit}{
- <-> ssub * FiraSans-TLF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{T1}{FiraSans-TLF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sl}{
- <-> ssub * FiraSans-TLF/extrabold/sl
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{sl}{
+ <-> ssub * FiraSans-TLF/extralight/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scsl}{
- <-> ssub * FiraSans-TLF/extrabold/scsl
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{scsl}{
+ <-> ssub * FiraSans-TLF/extralight/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sc}{
- <-> ssub * FiraSans-TLF/extrabold/sc
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{sc}{
+ <-> ssub * FiraSans-TLF/extralight/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{n}{
- <-> ssub * FiraSans-TLF/extrabold/n
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{n}{
+ <-> ssub * FiraSans-TLF/extralight/n
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{it}{
- <-> ssub * FiraSans-TLF/extrabold/it
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{it}{
+ <-> ssub * FiraSans-TLF/extralight/it
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scit}{
- <-> ssub * FiraSans-TLF/extrabold/scit
+\DeclareFontShape{T1}{FiraSans-TLF}{el}{scit}{
+ <-> ssub * FiraSans-TLF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sl}{
- <-> ssub * FiraSans-TLF/semibold/sl
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{sl}{
+ <-> ssub * FiraSans-TLF/light/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scsl}{
- <-> ssub * FiraSans-TLF/semibold/scsl
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{scsl}{
+ <-> ssub * FiraSans-TLF/light/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sc}{
- <-> ssub * FiraSans-TLF/semibold/sc
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{sc}{
+ <-> ssub * FiraSans-TLF/light/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{n}{
- <-> ssub * FiraSans-TLF/semibold/n
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{n}{
+ <-> ssub * FiraSans-TLF/light/n
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{it}{
- <-> ssub * FiraSans-TLF/semibold/it
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{it}{
+ <-> ssub * FiraSans-TLF/light/it
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scit}{
- <-> ssub * FiraSans-TLF/semibold/scit
+\DeclareFontShape{T1}{FiraSans-TLF}{l}{scit}{
+ <-> ssub * FiraSans-TLF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{sl}{
- <-> ssub * FiraSans-TLF/heavy/sl
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{sl}{
+ <-> ssub * FiraSans-TLF/regular/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{scsl}{
- <-> ssub * FiraSans-TLF/heavy/scsl
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{scsl}{
+ <-> ssub * FiraSans-TLF/regular/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{sc}{
- <-> ssub * FiraSans-TLF/heavy/sc
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{sc}{
+ <-> ssub * FiraSans-TLF/regular/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{n}{
- <-> ssub * FiraSans-TLF/heavy/n
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{n}{
+ <-> ssub * FiraSans-TLF/regular/n
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{it}{
- <-> ssub * FiraSans-TLF/heavy/it
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{it}{
+ <-> ssub * FiraSans-TLF/regular/it
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{ub}{scit}{
- <-> ssub * FiraSans-TLF/heavy/scit
+\DeclareFontShape{T1}{FiraSans-TLF}{m}{scit}{
+ <-> ssub * FiraSans-TLF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{sl}{
- <-> ssub * FiraSans-TLF/light/sl
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sl}{
+ <-> ssub * FiraSans-TLF/semibold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{scsl}{
- <-> ssub * FiraSans-TLF/light/scsl
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scsl}{
+ <-> ssub * FiraSans-TLF/semibold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{sc}{
- <-> ssub * FiraSans-TLF/light/sc
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{sc}{
+ <-> ssub * FiraSans-TLF/semibold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{n}{
- <-> ssub * FiraSans-TLF/light/n
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{n}{
+ <-> ssub * FiraSans-TLF/semibold/n
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{it}{
- <-> ssub * FiraSans-TLF/light/it
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{it}{
+ <-> ssub * FiraSans-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{l}{scit}{
- <-> ssub * FiraSans-TLF/light/scit
+\DeclareFontShape{T1}{FiraSans-TLF}{sb}{scit}{
+ <-> ssub * FiraSans-TLF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{sl}{
- <-> ssub * FiraSans-TLF/extralight/sl
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sl}{
+ <-> ssub * FiraSans-TLF/extrabold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{scsl}{
- <-> ssub * FiraSans-TLF/extralight/scsl
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scsl}{
+ <-> ssub * FiraSans-TLF/extrabold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{sc}{
- <-> ssub * FiraSans-TLF/extralight/sc
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{sc}{
+ <-> ssub * FiraSans-TLF/extrabold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{n}{
- <-> ssub * FiraSans-TLF/extralight/n
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{n}{
+ <-> ssub * FiraSans-TLF/extrabold/n
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{it}{
- <-> ssub * FiraSans-TLF/extralight/it
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{it}{
+ <-> ssub * FiraSans-TLF/extrabold/it
}{}
-\DeclareFontShape{T1}{FiraSans-TLF}{el}{scit}{
- <-> ssub * FiraSans-TLF/extralight/scit
+\DeclareFontShape{T1}{FiraSans-TLF}{eb}{scit}{
+ <-> ssub * FiraSans-TLF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{sl}{
+ <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{scsl}{
+ <-> ssub * FiraSans-TLF/heavy/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{sc}{
+ <-> ssub * FiraSans-TLF/heavy/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{n}{
+ <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{it}{
+ <-> ssub * FiraSans-TLF/heavy/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TLF}{ub}{scit}{
+ <-> ssub * FiraSans-TLF/heavy/scit
}{}
\DeclareFontShape{T1}{FiraSans-TLF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/T1FiraSans-TOsF.fd
index 8a16deeaeea..2492ccc39bc 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{T1FiraSans-TOsF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/FiraSans-TOsF.]
+ [2019/05/22 (autoinst) Font definitions for T1/FiraSans-TOsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -309,36 +309,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sl}{
- <-> ssub * FiraSans-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scsl}{
- <-> ssub * FiraSans-TOsF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sc}{
- <-> ssub * FiraSans-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{n}{
- <-> ssub * FiraSans-TOsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{it}{
- <-> ssub * FiraSans-TOsF/regular/it
-}{}
-
-\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scit}{
- <-> ssub * FiraSans-TOsF/regular/scit
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{T1}{FiraSans-TOsF}{ul}{sl}{
@@ -366,111 +339,111 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sl}{
- <-> ssub * FiraSans-TOsF/extrabold/sl
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sl}{
+ <-> ssub * FiraSans-TOsF/extralight/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scsl}{
- <-> ssub * FiraSans-TOsF/extrabold/scsl
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scsl}{
+ <-> ssub * FiraSans-TOsF/extralight/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sc}{
- <-> ssub * FiraSans-TOsF/extrabold/sc
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sc}{
+ <-> ssub * FiraSans-TOsF/extralight/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{n}{
- <-> ssub * FiraSans-TOsF/extrabold/n
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{n}{
+ <-> ssub * FiraSans-TOsF/extralight/n
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{it}{
- <-> ssub * FiraSans-TOsF/extrabold/it
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{it}{
+ <-> ssub * FiraSans-TOsF/extralight/it
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scit}{
- <-> ssub * FiraSans-TOsF/extrabold/scit
+\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scit}{
+ <-> ssub * FiraSans-TOsF/extralight/scit
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sl}{
- <-> ssub * FiraSans-TOsF/semibold/sl
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sl}{
+ <-> ssub * FiraSans-TOsF/light/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scsl}{
- <-> ssub * FiraSans-TOsF/semibold/scsl
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scsl}{
+ <-> ssub * FiraSans-TOsF/light/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sc}{
- <-> ssub * FiraSans-TOsF/semibold/sc
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sc}{
+ <-> ssub * FiraSans-TOsF/light/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{n}{
- <-> ssub * FiraSans-TOsF/semibold/n
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{n}{
+ <-> ssub * FiraSans-TOsF/light/n
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{it}{
- <-> ssub * FiraSans-TOsF/semibold/it
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{it}{
+ <-> ssub * FiraSans-TOsF/light/it
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scit}{
- <-> ssub * FiraSans-TOsF/semibold/scit
+\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scit}{
+ <-> ssub * FiraSans-TOsF/light/scit
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{sl}{
- <-> ssub * FiraSans-TOsF/heavy/sl
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sl}{
+ <-> ssub * FiraSans-TOsF/regular/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{scsl}{
- <-> ssub * FiraSans-TOsF/heavy/scsl
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scsl}{
+ <-> ssub * FiraSans-TOsF/regular/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{sc}{
- <-> ssub * FiraSans-TOsF/heavy/sc
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{sc}{
+ <-> ssub * FiraSans-TOsF/regular/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{n}{
- <-> ssub * FiraSans-TOsF/heavy/n
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{n}{
+ <-> ssub * FiraSans-TOsF/regular/n
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{it}{
- <-> ssub * FiraSans-TOsF/heavy/it
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{it}{
+ <-> ssub * FiraSans-TOsF/regular/it
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{scit}{
- <-> ssub * FiraSans-TOsF/heavy/scit
+\DeclareFontShape{T1}{FiraSans-TOsF}{m}{scit}{
+ <-> ssub * FiraSans-TOsF/regular/scit
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sl}{
- <-> ssub * FiraSans-TOsF/light/sl
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sl}{
+ <-> ssub * FiraSans-TOsF/semibold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scsl}{
- <-> ssub * FiraSans-TOsF/light/scsl
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scsl}{
+ <-> ssub * FiraSans-TOsF/semibold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{sc}{
- <-> ssub * FiraSans-TOsF/light/sc
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{sc}{
+ <-> ssub * FiraSans-TOsF/semibold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{n}{
- <-> ssub * FiraSans-TOsF/light/n
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{n}{
+ <-> ssub * FiraSans-TOsF/semibold/n
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{it}{
- <-> ssub * FiraSans-TOsF/light/it
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{it}{
+ <-> ssub * FiraSans-TOsF/semibold/it
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{l}{scit}{
- <-> ssub * FiraSans-TOsF/light/scit
+\DeclareFontShape{T1}{FiraSans-TOsF}{sb}{scit}{
+ <-> ssub * FiraSans-TOsF/semibold/scit
}{}
@@ -501,30 +474,57 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sl}{
- <-> ssub * FiraSans-TOsF/extralight/sl
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sl}{
+ <-> ssub * FiraSans-TOsF/extrabold/sl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scsl}{
- <-> ssub * FiraSans-TOsF/extralight/scsl
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scsl}{
+ <-> ssub * FiraSans-TOsF/extrabold/scsl
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{sc}{
- <-> ssub * FiraSans-TOsF/extralight/sc
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{sc}{
+ <-> ssub * FiraSans-TOsF/extrabold/sc
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{n}{
- <-> ssub * FiraSans-TOsF/extralight/n
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{n}{
+ <-> ssub * FiraSans-TOsF/extrabold/n
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{it}{
- <-> ssub * FiraSans-TOsF/extralight/it
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{it}{
+ <-> ssub * FiraSans-TOsF/extrabold/it
}{}
-\DeclareFontShape{T1}{FiraSans-TOsF}{el}{scit}{
- <-> ssub * FiraSans-TOsF/extralight/scit
+\DeclareFontShape{T1}{FiraSans-TOsF}{eb}{scit}{
+ <-> ssub * FiraSans-TOsF/extrabold/scit
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{sl}{
+ <-> ssub * FiraSans-TOsF/heavy/sl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{scsl}{
+ <-> ssub * FiraSans-TOsF/heavy/scsl
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{sc}{
+ <-> ssub * FiraSans-TOsF/heavy/sc
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{n}{
+ <-> ssub * FiraSans-TOsF/heavy/n
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{it}{
+ <-> ssub * FiraSans-TOsF/heavy/it
+}{}
+
+\DeclareFontShape{T1}{FiraSans-TOsF}{ub}{scit}{
+ <-> ssub * FiraSans-TOsF/heavy/scit
}{}
\DeclareFontShape{T1}{FiraSans-TOsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-LF.fd
index af154736300..d257d526998 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{TS1FiraSans-LF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/FiraSans-LF.]
+ [2019/05/22 (autoinst) Font definitions for TS1/FiraSans-LF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{TS1}{FiraSans-LF}{m}{sl}{
- <-> ssub * FiraSans-LF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-LF}{m}{n}{
- <-> ssub * FiraSans-LF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-LF}{m}{it}{
- <-> ssub * FiraSans-LF/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{TS1}{FiraSans-LF}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{TS1}{FiraSans-LF}{eb}{sl}{
- <-> ssub * FiraSans-LF/extrabold/sl
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{sl}{
+ <-> ssub * FiraSans-LF/extralight/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{eb}{n}{
- <-> ssub * FiraSans-LF/extrabold/n
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{n}{
+ <-> ssub * FiraSans-LF/extralight/n
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{eb}{it}{
- <-> ssub * FiraSans-LF/extrabold/it
+\DeclareFontShape{TS1}{FiraSans-LF}{el}{it}{
+ <-> ssub * FiraSans-LF/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{TS1}{FiraSans-LF}{sb}{sl}{
- <-> ssub * FiraSans-LF/semibold/sl
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{sl}{
+ <-> ssub * FiraSans-LF/light/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{sb}{n}{
- <-> ssub * FiraSans-LF/semibold/n
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{n}{
+ <-> ssub * FiraSans-LF/light/n
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{sb}{it}{
- <-> ssub * FiraSans-LF/semibold/it
+\DeclareFontShape{TS1}{FiraSans-LF}{l}{it}{
+ <-> ssub * FiraSans-LF/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{TS1}{FiraSans-LF}{ub}{sl}{
- <-> ssub * FiraSans-LF/heavy/sl
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{sl}{
+ <-> ssub * FiraSans-LF/regular/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{ub}{n}{
- <-> ssub * FiraSans-LF/heavy/n
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{n}{
+ <-> ssub * FiraSans-LF/regular/n
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{ub}{it}{
- <-> ssub * FiraSans-LF/heavy/it
+\DeclareFontShape{TS1}{FiraSans-LF}{m}{it}{
+ <-> ssub * FiraSans-LF/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{TS1}{FiraSans-LF}{l}{sl}{
- <-> ssub * FiraSans-LF/light/sl
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{sl}{
+ <-> ssub * FiraSans-LF/semibold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{l}{n}{
- <-> ssub * FiraSans-LF/light/n
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{n}{
+ <-> ssub * FiraSans-LF/semibold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{l}{it}{
- <-> ssub * FiraSans-LF/light/it
+\DeclareFontShape{TS1}{FiraSans-LF}{sb}{it}{
+ <-> ssub * FiraSans-LF/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{TS1}{FiraSans-LF}{el}{sl}{
- <-> ssub * FiraSans-LF/extralight/sl
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{sl}{
+ <-> ssub * FiraSans-LF/extrabold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{el}{n}{
- <-> ssub * FiraSans-LF/extralight/n
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{n}{
+ <-> ssub * FiraSans-LF/extrabold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-LF}{el}{it}{
- <-> ssub * FiraSans-LF/extralight/it
+\DeclareFontShape{TS1}{FiraSans-LF}{eb}{it}{
+ <-> ssub * FiraSans-LF/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ub}{sl}{
+ <-> ssub * FiraSans-LF/heavy/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ub}{n}{
+ <-> ssub * FiraSans-LF/heavy/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-LF}{ub}{it}{
+ <-> ssub * FiraSans-LF/heavy/it
}{}
\DeclareFontShape{TS1}{FiraSans-LF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-OsF.fd
index 4e1087d9ccf..385cd168fe7 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{TS1FiraSans-OsF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/FiraSans-OsF.]
+ [2019/05/22 (autoinst) Font definitions for TS1/FiraSans-OsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{TS1}{FiraSans-OsF}{m}{sl}{
- <-> ssub * FiraSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-OsF}{m}{n}{
- <-> ssub * FiraSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-OsF}{m}{it}{
- <-> ssub * FiraSans-OsF/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{TS1}{FiraSans-OsF}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{sl}{
- <-> ssub * FiraSans-OsF/extrabold/sl
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{sl}{
+ <-> ssub * FiraSans-OsF/extralight/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{n}{
- <-> ssub * FiraSans-OsF/extrabold/n
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{n}{
+ <-> ssub * FiraSans-OsF/extralight/n
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{it}{
- <-> ssub * FiraSans-OsF/extrabold/it
+\DeclareFontShape{TS1}{FiraSans-OsF}{el}{it}{
+ <-> ssub * FiraSans-OsF/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{sl}{
- <-> ssub * FiraSans-OsF/semibold/sl
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{sl}{
+ <-> ssub * FiraSans-OsF/light/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{n}{
- <-> ssub * FiraSans-OsF/semibold/n
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{n}{
+ <-> ssub * FiraSans-OsF/light/n
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{it}{
- <-> ssub * FiraSans-OsF/semibold/it
+\DeclareFontShape{TS1}{FiraSans-OsF}{l}{it}{
+ <-> ssub * FiraSans-OsF/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{sl}{
- <-> ssub * FiraSans-OsF/heavy/sl
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{sl}{
+ <-> ssub * FiraSans-OsF/regular/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{n}{
- <-> ssub * FiraSans-OsF/heavy/n
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{n}{
+ <-> ssub * FiraSans-OsF/regular/n
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{it}{
- <-> ssub * FiraSans-OsF/heavy/it
+\DeclareFontShape{TS1}{FiraSans-OsF}{m}{it}{
+ <-> ssub * FiraSans-OsF/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{TS1}{FiraSans-OsF}{l}{sl}{
- <-> ssub * FiraSans-OsF/light/sl
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{sl}{
+ <-> ssub * FiraSans-OsF/semibold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{l}{n}{
- <-> ssub * FiraSans-OsF/light/n
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{n}{
+ <-> ssub * FiraSans-OsF/semibold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{l}{it}{
- <-> ssub * FiraSans-OsF/light/it
+\DeclareFontShape{TS1}{FiraSans-OsF}{sb}{it}{
+ <-> ssub * FiraSans-OsF/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{TS1}{FiraSans-OsF}{el}{sl}{
- <-> ssub * FiraSans-OsF/extralight/sl
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{sl}{
+ <-> ssub * FiraSans-OsF/extrabold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{el}{n}{
- <-> ssub * FiraSans-OsF/extralight/n
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{n}{
+ <-> ssub * FiraSans-OsF/extrabold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-OsF}{el}{it}{
- <-> ssub * FiraSans-OsF/extralight/it
+\DeclareFontShape{TS1}{FiraSans-OsF}{eb}{it}{
+ <-> ssub * FiraSans-OsF/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{sl}{
+ <-> ssub * FiraSans-OsF/heavy/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{n}{
+ <-> ssub * FiraSans-OsF/heavy/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-OsF}{ub}{it}{
+ <-> ssub * FiraSans-OsF/heavy/it
}{}
\DeclareFontShape{TS1}{FiraSans-OsF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TLF.fd
index b90519d51d6..5e817721572 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{TS1FiraSans-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/FiraSans-TLF.]
+ [2019/05/22 (autoinst) Font definitions for TS1/FiraSans-TLF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{TS1}{FiraSans-TLF}{m}{sl}{
- <-> ssub * FiraSans-TLF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-TLF}{m}{n}{
- <-> ssub * FiraSans-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-TLF}{m}{it}{
- <-> ssub * FiraSans-TLF/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{TS1}{FiraSans-TLF}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{sl}{
- <-> ssub * FiraSans-TLF/extrabold/sl
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{sl}{
+ <-> ssub * FiraSans-TLF/extralight/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{n}{
- <-> ssub * FiraSans-TLF/extrabold/n
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{n}{
+ <-> ssub * FiraSans-TLF/extralight/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{it}{
- <-> ssub * FiraSans-TLF/extrabold/it
+\DeclareFontShape{TS1}{FiraSans-TLF}{el}{it}{
+ <-> ssub * FiraSans-TLF/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{sl}{
- <-> ssub * FiraSans-TLF/semibold/sl
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{sl}{
+ <-> ssub * FiraSans-TLF/light/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{n}{
- <-> ssub * FiraSans-TLF/semibold/n
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{n}{
+ <-> ssub * FiraSans-TLF/light/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{it}{
- <-> ssub * FiraSans-TLF/semibold/it
+\DeclareFontShape{TS1}{FiraSans-TLF}{l}{it}{
+ <-> ssub * FiraSans-TLF/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{sl}{
- <-> ssub * FiraSans-TLF/heavy/sl
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{sl}{
+ <-> ssub * FiraSans-TLF/regular/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{n}{
- <-> ssub * FiraSans-TLF/heavy/n
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{n}{
+ <-> ssub * FiraSans-TLF/regular/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{it}{
- <-> ssub * FiraSans-TLF/heavy/it
+\DeclareFontShape{TS1}{FiraSans-TLF}{m}{it}{
+ <-> ssub * FiraSans-TLF/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{TS1}{FiraSans-TLF}{l}{sl}{
- <-> ssub * FiraSans-TLF/light/sl
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{sl}{
+ <-> ssub * FiraSans-TLF/semibold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{l}{n}{
- <-> ssub * FiraSans-TLF/light/n
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{n}{
+ <-> ssub * FiraSans-TLF/semibold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{l}{it}{
- <-> ssub * FiraSans-TLF/light/it
+\DeclareFontShape{TS1}{FiraSans-TLF}{sb}{it}{
+ <-> ssub * FiraSans-TLF/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{TS1}{FiraSans-TLF}{el}{sl}{
- <-> ssub * FiraSans-TLF/extralight/sl
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{sl}{
+ <-> ssub * FiraSans-TLF/extrabold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{el}{n}{
- <-> ssub * FiraSans-TLF/extralight/n
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{n}{
+ <-> ssub * FiraSans-TLF/extrabold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TLF}{el}{it}{
- <-> ssub * FiraSans-TLF/extralight/it
+\DeclareFontShape{TS1}{FiraSans-TLF}{eb}{it}{
+ <-> ssub * FiraSans-TLF/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{sl}{
+ <-> ssub * FiraSans-TLF/heavy/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{n}{
+ <-> ssub * FiraSans-TLF/heavy/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TLF}{ub}{it}{
+ <-> ssub * FiraSans-TLF/heavy/it
}{}
\DeclareFontShape{TS1}{FiraSans-TLF}{bx}{n}{
diff --git a/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd b/Master/texmf-dist/tex/latex/fira/TS1FiraSans-TOsF.fd
index 6f1dd9a8d79..20c4b28cbbe 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 2019/04/04
+%% Generated by autoinst on 2019/05/22
%%
\ProvidesFile{TS1FiraSans-TOsF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/FiraSans-TOsF.]
+ [2019/05/22 (autoinst) Font definitions for TS1/FiraSans-TOsF.]
\expandafter\ifx\csname FiraSans@scale\endcsname\relax
\let\FiraSans@@scale\@empty
@@ -177,24 +177,9 @@
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
-% m --> regular
-
-\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{sl}{
- <-> ssub * FiraSans-TOsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{n}{
- <-> ssub * FiraSans-TOsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{it}{
- <-> ssub * FiraSans-TOsF/regular/it
-}{}
-
-
% ul --> ultralight
\DeclareFontShape{TS1}{FiraSans-TOsF}{ul}{sl}{
@@ -210,63 +195,63 @@
}{}
-% eb --> extrabold
+% el --> extralight
-\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{sl}{
- <-> ssub * FiraSans-TOsF/extrabold/sl
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{sl}{
+ <-> ssub * FiraSans-TOsF/extralight/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{n}{
- <-> ssub * FiraSans-TOsF/extrabold/n
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{n}{
+ <-> ssub * FiraSans-TOsF/extralight/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{it}{
- <-> ssub * FiraSans-TOsF/extrabold/it
+\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{it}{
+ <-> ssub * FiraSans-TOsF/extralight/it
}{}
-% sb --> semibold
+% l --> light
-\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{sl}{
- <-> ssub * FiraSans-TOsF/semibold/sl
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{sl}{
+ <-> ssub * FiraSans-TOsF/light/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{n}{
- <-> ssub * FiraSans-TOsF/semibold/n
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{n}{
+ <-> ssub * FiraSans-TOsF/light/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{it}{
- <-> ssub * FiraSans-TOsF/semibold/it
+\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{it}{
+ <-> ssub * FiraSans-TOsF/light/it
}{}
-% ub --> heavy
+% m --> regular
-\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{sl}{
- <-> ssub * FiraSans-TOsF/heavy/sl
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{sl}{
+ <-> ssub * FiraSans-TOsF/regular/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{n}{
- <-> ssub * FiraSans-TOsF/heavy/n
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{n}{
+ <-> ssub * FiraSans-TOsF/regular/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{it}{
- <-> ssub * FiraSans-TOsF/heavy/it
+\DeclareFontShape{TS1}{FiraSans-TOsF}{m}{it}{
+ <-> ssub * FiraSans-TOsF/regular/it
}{}
-% l --> light
+% sb --> semibold
-\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{sl}{
- <-> ssub * FiraSans-TOsF/light/sl
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{sl}{
+ <-> ssub * FiraSans-TOsF/semibold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{n}{
- <-> ssub * FiraSans-TOsF/light/n
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{n}{
+ <-> ssub * FiraSans-TOsF/semibold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{l}{it}{
- <-> ssub * FiraSans-TOsF/light/it
+\DeclareFontShape{TS1}{FiraSans-TOsF}{sb}{it}{
+ <-> ssub * FiraSans-TOsF/semibold/it
}{}
@@ -285,18 +270,33 @@
}{}
-% el --> extralight
+% eb --> extrabold
-\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{sl}{
- <-> ssub * FiraSans-TOsF/extralight/sl
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{sl}{
+ <-> ssub * FiraSans-TOsF/extrabold/sl
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{n}{
- <-> ssub * FiraSans-TOsF/extralight/n
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{n}{
+ <-> ssub * FiraSans-TOsF/extrabold/n
}{}
-\DeclareFontShape{TS1}{FiraSans-TOsF}{el}{it}{
- <-> ssub * FiraSans-TOsF/extralight/it
+\DeclareFontShape{TS1}{FiraSans-TOsF}{eb}{it}{
+ <-> ssub * FiraSans-TOsF/extrabold/it
+}{}
+
+
+% ub --> heavy
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{sl}{
+ <-> ssub * FiraSans-TOsF/heavy/sl
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{n}{
+ <-> ssub * FiraSans-TOsF/heavy/n
+}{}
+
+\DeclareFontShape{TS1}{FiraSans-TOsF}{ub}{it}{
+ <-> ssub * FiraSans-TOsF/heavy/it
}{}
\DeclareFontShape{TS1}{FiraSans-TOsF}{bx}{n}{