1 files changed, 216 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd
index 27af0cef5e5..dbde1dc62fd 100644
--- a/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd
+++ b/Master/texmf-dist/tex/latex/montserrat/OT1Montserrat-Numr.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2017/01/25
+%% Generated by autoinst on 2019/10/18
 %%
 \ProvidesFile{OT1Montserrat-Numr.fd}
-    [2017/01/25 (autoinst)  Font definitions for OT1/Montserrat-Numr.]
+    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-Numr.]
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -11,112 +11,281 @@
 
 \DeclareFontFamily{OT1}{Montserrat-Numr}{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{t}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ot1
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{t}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{t}{sl}{
-      <-> ssub * Montserrat-Numr/t/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{sl}{
+      <-> ssub * Montserrat-Numr/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{it}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{sl}{
+      <-> ssub * Montserrat-Numr/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{sl}{
+      <-> ssub * Montserrat-Numr/black/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{it}{
       <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{n}{
       <-> \Montserrat@@scale Montserrat-SemiBold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{
-      <-> ssub * Montserrat-Numr/sb/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{sl}{
+      <-> ssub * Montserrat-Numr/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{sl}{
+      <-> ssub * Montserrat-Numr/bold/it
+}{}
+
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{thin}{sl}{
+      <-> ssub * Montserrat-Numr/thin/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{extrabold}{sl}{
+      <-> ssub * Montserrat-Numr/extrabold/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{l}{n}{
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{n}{
       <-> \Montserrat@@scale Montserrat-Light-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{
-      <-> ssub * Montserrat-Numr/l/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{sl}{
+      <-> ssub * Montserrat-Numr/light/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{n}{
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{n}{
       <-> \Montserrat@@scale Montserrat-Medium-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{it}{
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{it}{
       <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{mb}{sl}{
-      <-> ssub * Montserrat-Numr/mb/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{sl}{
+      <-> ssub * Montserrat-Numr/medium/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-numr-ot1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{sl}{
+      <-> ssub * Montserrat-Numr/thin/sl
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{n}{
+      <-> ssub * Montserrat-Numr/thin/n
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{it}{
+      <-> ssub * Montserrat-Numr/thin/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{
+      <-> ssub * Montserrat-Numr/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{
+      <-> ssub * Montserrat-Numr/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{
+      <-> ssub * Montserrat-Numr/extralight/n
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{
+      <-> ssub * Montserrat-Numr/light/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{
+      <-> ssub * Montserrat-Numr/light/sl
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{l}{n}{
+      <-> ssub * Montserrat-Numr/light/n
+}{}
+
+
+%   sl --> regular
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{it}{
+      <-> ssub * Montserrat-Numr/regular/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{sl}{
+      <-> ssub * Montserrat-Numr/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{n}{
+      <-> ssub * Montserrat-Numr/regular/n
+}{}
+
+
+%   m --> medium
+
 \DeclareFontShape{OT1}{Montserrat-Numr}{m}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-numr-ot1
+      <-> ssub * Montserrat-Numr/medium/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{m}{sl}{
-      <-> ssub * Montserrat-Numr/m/it
+      <-> ssub * Montserrat-Numr/medium/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{
+      <-> ssub * Montserrat-Numr/medium/n
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{
+      <-> ssub * Montserrat-Numr/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{
+      <-> ssub * Montserrat-Numr/semibold/sl
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{it}{
+      <-> ssub * Montserrat-Numr/semibold/it
+}{}
+
+
+%   b --> bold
+
 \DeclareFontShape{OT1}{Montserrat-Numr}{b}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1
+      <-> ssub * Montserrat-Numr/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{
-      <-> ssub * Montserrat-Numr/b/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{
+      <-> ssub * Montserrat-Numr/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{
+      <-> ssub * Montserrat-Numr/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ot1
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{
+      <-> ssub * Montserrat-Numr/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{eb}{sl}{
-      <-> ssub * Montserrat-Numr/eb/it
+      <-> ssub * Montserrat-Numr/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{k}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{n}{
+      <-> ssub * Montserrat-Numr/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{k}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-numr-ot1
-}{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{k}{sl}{
-      <-> ssub * Montserrat-Numr/k/it
+%   ub --> black
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{it}{
+      <-> ssub * Montserrat-Numr/black/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{sl}{
+      <-> ssub * Montserrat-Numr/black/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{n}{
+      <-> ssub * Montserrat-Numr/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{
-      <-> ssub * Montserrat-Numr/el/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{n}{
+      <-> ssub * Montserrat-Numr/b/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{bx}{sl}{
@@ -127,8 +296,4 @@
       <-> ssub * Montserrat-Numr/b/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{n}{
-      <-> ssub * Montserrat-Numr/b/n
-}{}
-
 \endinput