montserrat (19oct19)

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

1 files changed, 376 insertions, 103 deletions

diff --git a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd
index 120038ae0ef..da2f4087e29 100644
--- a/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/montserrat/T1Montserrat-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2017/01/25
+%% Generated by autoinst on 2019/10/18
 %%
 \ProvidesFile{T1Montserrat-TOsF.fd}
-    [2017/01/25 (autoinst)  Font definitions for T1/Montserrat-TOsF.]
+    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-TOsF.]
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -11,236 +11,493 @@
 
 \DeclareFontFamily{T1}{Montserrat-TOsF}{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{it}{
       <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scit}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scit}{
       <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{
-      <-> ssub * Montserrat-TOsF/el/scit
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{
-      <-> ssub * Montserrat-TOsF/el/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{it}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{it}{
       <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sl}{
+      <-> ssub * Montserrat-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scsl}{
+      <-> ssub * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{scsl}{
-      <-> ssub * Montserrat-TOsF/k/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{k}{sl}{
-      <-> ssub * Montserrat-TOsF/k/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scsl}{
+      <-> ssub * Montserrat-TOsF/regular/scit
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scit}{
       <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{n}{
       <-> \Montserrat@@scale Montserrat-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scsl}{
+      <-> ssub * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{
-      <-> ssub * Montserrat-TOsF/b/scit
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sl}{
-      <-> ssub * Montserrat-TOsF/b/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TOsF/semibold/scit
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sl}{
+      <-> ssub * Montserrat-TOsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scsl}{
+      <-> ssub * Montserrat-TOsF/thin/scit
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scit}{
       <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{n}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{n}{
       <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{
-      <-> ssub * Montserrat-TOsF/eb/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{
-      <-> ssub * Montserrat-TOsF/eb/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-t1
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scsl}{
-      <-> ssub * Montserrat-TOsF/m/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sl}{
+      <-> ssub * Montserrat-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sl}{
-      <-> ssub * Montserrat-TOsF/m/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scsl}{
+      <-> ssub * Montserrat-TOsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{sc}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sc}{
       <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{scit}{
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scit}{
       <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sl}{
+      <-> ssub * Montserrat-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{scsl}{
-      <-> ssub * Montserrat-TOsF/mb/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scsl}{
+      <-> ssub * Montserrat-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{mb}{sl}{
-      <-> ssub * Montserrat-TOsF/mb/it
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sc}{
+      <-> ssub * Montserrat-TOsF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{n}{
+      <-> ssub * Montserrat-TOsF/thin/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scsl}{
+      <-> ssub * Montserrat-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sl}{
+      <-> ssub * Montserrat-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{it}{
+      <-> ssub * Montserrat-TOsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scit}{
+      <-> ssub * Montserrat-TOsF/thin/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{
+      <-> ssub * Montserrat-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scit}{
+      <-> ssub * Montserrat-TOsF/extralight/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{
+      <-> ssub * Montserrat-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{
+      <-> ssub * Montserrat-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sc}{
+      <-> ssub * Montserrat-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/sl
 }{}
 
+
+%   l --> light
+
 \DeclareFontShape{T1}{Montserrat-TOsF}{l}{scsl}{
-      <-> ssub * Montserrat-TOsF/l/scit
+      <-> ssub * Montserrat-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{
+      <-> ssub * Montserrat-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{
+      <-> ssub * Montserrat-TOsF/light/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{l}{sl}{
-      <-> ssub * Montserrat-TOsF/l/it
+      <-> ssub * Montserrat-TOsF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{
+      <-> ssub * Montserrat-TOsF/light/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{
+      <-> ssub * Montserrat-TOsF/light/scit
 }{}
 
+
+%   sl --> regular
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scsl}{
+      <-> ssub * Montserrat-TOsF/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{n}{
+      <-> ssub * Montserrat-TOsF/regular/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sc}{
+      <-> ssub * Montserrat-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scit}{
+      <-> ssub * Montserrat-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{it}{
+      <-> ssub * Montserrat-TOsF/regular/it
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sl}{
+      <-> ssub * Montserrat-TOsF/medium/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scsl}{
+      <-> ssub * Montserrat-TOsF/medium/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{
+      <-> ssub * Montserrat-TOsF/medium/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{sc}{
+      <-> ssub * Montserrat-TOsF/medium/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{
+      <-> ssub * Montserrat-TOsF/medium/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{
+      <-> ssub * Montserrat-TOsF/medium/it
+}{}
+
+
+%   sb --> semibold
+
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1
+      <-> ssub * Montserrat-TOsF/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{it}{
+      <-> ssub * Montserrat-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1
+      <-> ssub * Montserrat-TOsF/semibold/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1
+      <-> ssub * Montserrat-TOsF/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scsl}{
-      <-> ssub * Montserrat-TOsF/sb/scit
+      <-> ssub * Montserrat-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{
-      <-> ssub * Montserrat-TOsF/sb/it
+
+%   b --> bold
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{
+      <-> ssub * Montserrat-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{
+      <-> ssub * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{
+      <-> ssub * Montserrat-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{
+      <-> ssub * Montserrat-TOsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{
+      <-> ssub * Montserrat-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{scsl}{
-      <-> ssub * Montserrat-TOsF/t/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{t}{sl}{
-      <-> ssub * Montserrat-TOsF/t/it
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{
+      <-> ssub * Montserrat-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{sl}{
-      <-> ssub * Montserrat-TOsF/b/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{it}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{
-      <-> ssub * Montserrat-TOsF/b/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{
-      <-> ssub * Montserrat-TOsF/b/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{n}{
+      <-> ssub * Montserrat-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{
-      <-> ssub * Montserrat-TOsF/b/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sc}{
+      <-> ssub * Montserrat-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{
+      <-> ssub * Montserrat-TOsF/extrabold/scsl
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sl}{
+      <-> ssub * Montserrat-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scsl}{
+      <-> ssub * Montserrat-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{n}{
+      <-> ssub * Montserrat-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sc}{
+      <-> ssub * Montserrat-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scit}{
+      <-> ssub * Montserrat-TOsF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{it}{
+      <-> ssub * Montserrat-TOsF/black/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bx}{n}{
@@ -251,4 +508,20 @@
       <-> ssub * Montserrat-TOsF/b/sc
 }{}
 
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{
+      <-> ssub * Montserrat-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{sl}{
+      <-> ssub * Montserrat-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{
+      <-> ssub * Montserrat-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{
+      <-> ssub * Montserrat-TOsF/b/scit
+}{}
+
 \endinput