CTAN sync 201910200300

1 files changed, 222 insertions, 57 deletions

diff --git a/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd b/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
index f2718b47cf..85c54bd689 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
@@ -1,122 +1,291 @@
-%% Generated by autoinst on 2017/01/25
+%% Generated by autoinst on 2019/10/18
 %%
 \ProvidesFile{T1MontserratAlternates-Dnom.fd}
-    [2017/01/25 (autoinst)  Font definitions for T1/MontserratAlternates-Dnom.]
+    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-Dnom.]
 
-\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{T1}{MontserratAlternates-Dnom}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ThinItalic-dnom-t1
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Thin-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{t}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/t/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/light/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-dnom-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBold-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/sb/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/medium/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{black}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/black/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/regular/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Medium-dnom-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/thin/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-MediumItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/bold/it
+}{}
+
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{mb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/mb/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extralight/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/thin/sl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{it}{
+      <-> ssub * MontserratAlternates-Dnom/thin/it
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{n}{
+      <-> ssub * MontserratAlternates-Dnom/thin/n
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{
+      <-> ssub * MontserratAlternates-Dnom/extralight/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{
+      <-> ssub * MontserratAlternates-Dnom/extralight/it
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extralight/sl
+}{}
+
+
+%   l --> light
+
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-LightItalic-dnom-t1
+      <-> ssub * MontserratAlternates-Dnom/light/it
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/light/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Light-dnom-t1
+      <-> ssub * MontserratAlternates-Dnom/light/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/l/it
+
+%   sl --> regular
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{n}{
+      <-> ssub * MontserratAlternates-Dnom/regular/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{it}{
+      <-> ssub * MontserratAlternates-Dnom/regular/it
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/regular/sl
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/medium/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-Italic-dnom-t1
+      <-> ssub * MontserratAlternates-Dnom/medium/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Regular-dnom-t1
+      <-> ssub * MontserratAlternates-Dnom/medium/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/m/it
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Bold-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/sl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{n}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/n
+}{}
+
+
+%   b --> bold
+
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BoldItalic-dnom-t1
+      <-> ssub * MontserratAlternates-Dnom/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/b/it
+      <-> ssub * MontserratAlternates-Dnom/bold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{n}{
+      <-> ssub * MontserratAlternates-Dnom/bold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBold-dnom-t1
-}{}
+
+%   eb --> extrabold
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/eb/it
+      <-> ssub * MontserratAlternates-Dnom/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Black-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BlackItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{k}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/k/it
+
+%   ub --> black
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{n}{
+      <-> ssub * MontserratAlternates-Dnom/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{it}{
+      <-> ssub * MontserratAlternates-Dnom/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLight-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/black/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/el/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{n}{
+      <-> ssub * MontserratAlternates-Dnom/b/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{it}{
@@ -127,8 +296,4 @@
       <-> ssub * MontserratAlternates-Dnom/b/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{n}{
-      <-> ssub * MontserratAlternates-Dnom/b/n
-}{}
-
 \endinput