montserrat (19oct19)

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

1 files changed, 386 insertions, 113 deletions

diff --git a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd
index 337e1e9de0f..d21345234d1 100644
--- a/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd
+++ b/Master/texmf-dist/tex/latex/montserrat/LY1MontserratAlternates-OsF.fd
@@ -1,248 +1,521 @@
-%% Generated by autoinst on 2017/01/25
+%% Generated by autoinst on 2019/10/18
 %%
 \ProvidesFile{LY1MontserratAlternates-OsF.fd}
-    [2017/01/25 (autoinst)  Font definitions for LY1/MontserratAlternates-OsF.]
+    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-OsF.]
 
-\expandafter\ifx\csname Montserrat@scale\endcsname\relax
-    \let\Montserrat@@scale\@empty
+\expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
+    \let\MontserratAlternates@@scale\@empty
 \else
-    \edef\Montserrat@@scale{s*[\csname Montserrat@scale\endcsname]}%
+    \edef\MontserratAlternates@@scale{s*[\csname MontserratAlternates@scale\endcsname]}%
 \fi
 
 \DeclareFontFamily{LY1}{MontserratAlternates-OsF}{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/sb/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/sb/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-OsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Thin-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Thin-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/t/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{t}{sl}{
-      <-> ssub * MontserratAlternates-OsF/t/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-Italic-osf-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Regular-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/m/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-OsF/m/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-ly1
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-LightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Light-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Light-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/l/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-OsF/l/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Medium-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Medium-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/mb/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{mb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/mb/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-ly1
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-BlackItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Black-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Black-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/k/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{k}{sl}{
-      <-> ssub * MontserratAlternates-OsF/k/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-OsF/regular/it
+}{}
+
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{n}{
+      <-> ssub * MontserratAlternates-OsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scit}{
+      <-> ssub * MontserratAlternates-OsF/thin/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{it}{
+      <-> ssub * MontserratAlternates-OsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sc}{
+      <-> ssub * MontserratAlternates-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sl}{
+      <-> ssub * MontserratAlternates-OsF/thin/sl
+}{}
+
+
+%   el --> extralight
+
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1
+      <-> ssub * MontserratAlternates-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-ly1
+      <-> ssub * MontserratAlternates-OsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLight-osf-sc-ly1
+      <-> ssub * MontserratAlternates-OsF/extralight/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-osf-ly1
+      <-> ssub * MontserratAlternates-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/el/scit
+
+%   l --> light
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-OsF/el/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{
+      <-> ssub * MontserratAlternates-OsF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{
+      <-> ssub * MontserratAlternates-OsF/light/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scit}{
+      <-> ssub * MontserratAlternates-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/eb/scit
+
+%   sl --> regular
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sl}{
+      <-> ssub * MontserratAlternates-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/eb/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sc}{
+      <-> ssub * MontserratAlternates-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{
-      <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{it}{
+      <-> ssub * MontserratAlternates-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{
-      <-> \Montserrat@@scale MontserratAlternates-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scit}{
+      <-> ssub * MontserratAlternates-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Bold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{n}{
+      <-> ssub * MontserratAlternates-OsF/regular/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/regular/scsl
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sl}{
+      <-> ssub * MontserratAlternates-OsF/medium/sl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{
+      <-> ssub * MontserratAlternates-OsF/medium/sc
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{
+      <-> ssub * MontserratAlternates-OsF/medium/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{
+      <-> ssub * MontserratAlternates-OsF/medium/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{
+      <-> ssub * MontserratAlternates-OsF/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/medium/scsl
 }{}
 
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sc}{
+      <-> ssub * MontserratAlternates-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{n}{
+      <-> ssub * MontserratAlternates-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scit
+}{}
+
+
+%   b --> bold
+
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BoldItalic-osf-ly1
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/b/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{
+      <-> ssub * MontserratAlternates-OsF/bold/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-OsF/b/it
+      <-> ssub * MontserratAlternates-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/b/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{
-      <-> ssub * MontserratAlternates-OsF/b/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{
+      <-> ssub * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-OsF/b/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{
+      <-> ssub * MontserratAlternates-OsF/bold/n
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sc}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/scsl
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{n}{
+      <-> ssub * MontserratAlternates-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scit}{
+      <-> ssub * MontserratAlternates-OsF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{it}{
+      <-> ssub * MontserratAlternates-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sc}{
+      <-> ssub * MontserratAlternates-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{n}{
       <-> ssub * MontserratAlternates-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{
+      <-> ssub * MontserratAlternates-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-OsF/b/sc
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sl}{
       <-> ssub * MontserratAlternates-OsF/b/sl
 }{}