CTAN sync 201910200300

1 files changed, 214 insertions, 49 deletions

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