CTAN sync 201911090301

1 files changed, 218 insertions, 237 deletions

diff --git a/fonts/montserrat/tex/T1Montserrat-OsF.fd b/fonts/montserrat/tex/T1Montserrat-OsF.fd
index 3c91f2a20a..9d9106c240 100644
--- a/fonts/montserrat/tex/T1Montserrat-OsF.fd
+++ b/fonts/montserrat/tex/T1Montserrat-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,492 +20,469 @@
 \DeclareFontFamily{T1}{Montserrat-OsF}{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{sl}{
-      <-> ssub * Montserrat-OsF/light/it
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sl}{
+      <-> ssub * Montserrat-OsF/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sl}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scsl}{
+      <-> ssub * Montserrat-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sl}{
+      <-> ssub * Montserrat-OsF/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sl}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-OsF/extrabold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scsl}{
+      <-> ssub * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sl}{
+      <-> ssub * Montserrat-OsF/thin/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sl}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sl}{
+      <-> ssub * Montserrat-OsF/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{scsl}{
+      <-> ssub * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{sl}{
+      <-> ssub * Montserrat-OsF/light/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scsl}{
+      <-> ssub * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sl}{
+      <-> ssub * Montserrat-OsF/bold/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{sc}{
       <-> \Montserrat@@scale Montserrat-Black-osf-sc-t1
 }{}
 
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-t1
+}{}
+
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{sl}{
-      <-> ssub * Montserrat-OsF/black/it
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{scsl}{
       <-> ssub * Montserrat-OsF/black/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{sl}{
+      <-> ssub * Montserrat-OsF/black/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sl}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scsl}{
+      <-> ssub * Montserrat-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sl}{
+      <-> ssub * Montserrat-OsF/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{it}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scsl}{
+      <-> alias * Montserrat-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scit}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sc}{
+      <-> alias * Montserrat-OsF/thin/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ul}{n}{
-      <-> ssub * Montserrat-OsF/thin/n
+      <-> alias * Montserrat-OsF/thin/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sc}{
-      <-> ssub * Montserrat-OsF/thin/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{it}{
+      <-> alias * Montserrat-OsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scit}{
+      <-> alias * Montserrat-OsF/thin/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ul}{sl}{
-      <-> ssub * Montserrat-OsF/thin/sl
+      <-> alias * Montserrat-OsF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{
-      <-> ssub * Montserrat-OsF/extralight/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{
+      <-> alias * Montserrat-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{
-      <-> ssub * Montserrat-OsF/extralight/n
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{
+      <-> alias * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{
+      <-> alias * Montserrat-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{
+      <-> alias * Montserrat-OsF/extralight/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{el}{it}{
-      <-> ssub * Montserrat-OsF/extralight/it
+      <-> alias * Montserrat-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{
+      <-> alias * Montserrat-OsF/extralight/scsl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{n}{
-      <-> ssub * Montserrat-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{sc}{
-      <-> ssub * Montserrat-OsF/light/sc
-}{}
-
 \DeclareFontShape{T1}{Montserrat-OsF}{l}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scsl
+      <-> alias * Montserrat-OsF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{sl}{
-      <-> ssub * Montserrat-OsF/light/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{sc}{
+      <-> alias * Montserrat-OsF/light/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{l}{it}{
-      <-> ssub * Montserrat-OsF/light/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{
-      <-> ssub * Montserrat-OsF/light/scit
+      <-> alias * Montserrat-OsF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sl}{
-      <-> ssub * Montserrat-OsF/regular/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{n}{
+      <-> alias * Montserrat-OsF/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{
+      <-> alias * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sc}{
-      <-> ssub * Montserrat-OsF/regular/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{sl}{
+      <-> alias * Montserrat-OsF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{n}{
-      <-> ssub * Montserrat-OsF/regular/n
-}{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scit}{
-      <-> ssub * Montserrat-OsF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{it}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{sc}{
+      <-> alias * Montserrat-OsF/regular/sc
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{scit}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{n}{
+      <-> alias * Montserrat-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{m}{it}{
-      <-> ssub * Montserrat-OsF/medium/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{
-      <-> ssub * Montserrat-OsF/medium/sl
+      <-> alias * Montserrat-OsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{m}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scsl
+      <-> alias * Montserrat-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{sc}{
-      <-> ssub * Montserrat-OsF/medium/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{
+      <-> alias * Montserrat-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{n}{
-      <-> ssub * Montserrat-OsF/medium/n
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{scit}{
+      <-> alias * Montserrat-OsF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{it}{
-      <-> ssub * Montserrat-OsF/semibold/it
+      <-> alias * Montserrat-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{
+      <-> alias * Montserrat-OsF/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{sc}{
-      <-> ssub * Montserrat-OsF/semibold/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{
-      <-> ssub * Montserrat-OsF/semibold/n
+      <-> alias * Montserrat-OsF/semibold/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scsl
+      <-> alias * Montserrat-OsF/semibold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/sl
+      <-> alias * Montserrat-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{
+      <-> alias * Montserrat-OsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{T1}{Montserrat-OsF}{b}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scsl
+      <-> alias * Montserrat-OsF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{b}{n}{
-      <-> ssub * Montserrat-OsF/bold/n
+      <-> alias * Montserrat-OsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{
-      <-> ssub * Montserrat-OsF/bold/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{
+      <-> alias * Montserrat-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{
-      <-> ssub * Montserrat-OsF/bold/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{
+      <-> alias * Montserrat-OsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{
+      <-> alias * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{
+      <-> alias * Montserrat-OsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{
+      <-> alias * Montserrat-OsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{
+      <-> alias * Montserrat-OsF/extrabold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{
+      <-> alias * Montserrat-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{
-      <-> ssub * Montserrat-OsF/extrabold/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{
+      <-> alias * Montserrat-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{
-      <-> ssub * Montserrat-OsF/extrabold/n
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{
+      <-> alias * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{
+      <-> alias * Montserrat-OsF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scit}{
+      <-> alias * Montserrat-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sc}{
-      <-> ssub * Montserrat-OsF/black/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sl}{
+      <-> alias * Montserrat-OsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{n}{
-      <-> ssub * Montserrat-OsF/black/n
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scsl}{
+      <-> alias * Montserrat-OsF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sl}{
-      <-> ssub * Montserrat-OsF/black/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sc}{
+      <-> alias * Montserrat-OsF/black/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ub}{it}{
-      <-> ssub * Montserrat-OsF/black/it
+      <-> alias * Montserrat-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scit}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{n}{
+      <-> alias * Montserrat-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{
+      <-> ssub * Montserrat-OsF/b/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{bx}{sl}{
@@ -508,20 +493,16 @@
       <-> ssub * Montserrat-OsF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{
-      <-> ssub * Montserrat-OsF/b/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{
+      <-> ssub * Montserrat-OsF/b/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{bx}{n}{
       <-> ssub * Montserrat-OsF/b/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{
-      <-> ssub * Montserrat-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{
-      <-> ssub * Montserrat-OsF/b/it
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{
+      <-> ssub * Montserrat-OsF/b/sc
 }{}
 
 \endinput