montserrat (19oct19)

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

1 files changed, 222 insertions, 57 deletions

diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
index 185773b2580..2c5f789b647 100644
--- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
+++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
@@ -1,122 +1,287 @@
-%% Generated by autoinst on 2017/01/25
+%% Generated by autoinst on 2019/10/18
 %%
 \ProvidesFile{TS1MontserratAlternates-TLF.fd}
-    [2017/01/25 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
+    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
 
-\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{TS1}{MontserratAlternates-TLF}{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Light-tlf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-LightItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/l/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-TLF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-MediumItalic-tlf-ts1
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Medium-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{mb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/mb/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Regular-tlf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-Italic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/m/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Thin-tlf-ts1
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ThinItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{t}{sl}{
-      <-> ssub * MontserratAlternates-TLF/t/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TLF/black/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-SemiBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/sb/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BoldItalic-tlf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Bold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/b/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraBold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/eb/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
+}{}
+
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-Black-tlf-ts1
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{k}{sl}{
-      <-> ssub * MontserratAlternates-TLF/k/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{it}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{n}{
+      <-> ssub * MontserratAlternates-TLF/thin/n
+}{}
+
+
+%   el --> extralight
+
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLight-tlf-ts1
+      <-> ssub * MontserratAlternates-TLF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{
-      <-> \Montserrat@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/el/it
+
+%   l --> light
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{
+      <-> ssub * MontserratAlternates-TLF/light/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{
+      <-> ssub * MontserratAlternates-TLF/light/n
+}{}
+
+
+%   sl --> regular
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{n}{
+      <-> ssub * MontserratAlternates-TLF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{it}{
+      <-> ssub * MontserratAlternates-TLF/regular/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/sl
+}{}
+
+
+%   m --> medium
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{
+      <-> ssub * MontserratAlternates-TLF/medium/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{
+      <-> ssub * MontserratAlternates-TLF/medium/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{
+      <-> ssub * MontserratAlternates-TLF/medium/n
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{
+      <-> ssub * MontserratAlternates-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{
+      <-> ssub * MontserratAlternates-TLF/semibold/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{
+      <-> ssub * MontserratAlternates-TLF/bold/n
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{it}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/n
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> ssub * MontserratAlternates-TLF/black/it
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{sl}{
+      <-> ssub * MontserratAlternates-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{n}{
+      <-> ssub * MontserratAlternates-TLF/black/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{