montserrat (8nov19)

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

1 files changed, 109 insertions, 116 deletions

diff --git a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
index 2c5f789b647..ec0ea574c9f 100644
--- a/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
+++ b/Master/texmf-dist/tex/latex/montserrat/TS1MontserratAlternates-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1MontserratAlternates-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
+
+\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 MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,33 +20,48 @@
 \DeclareFontFamily{TS1}{MontserratAlternates-TLF}{}
 
 
-%   ----  medium  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
+}{}
+
+
+%   ----  medium  ----
+
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1
+}{}
+
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{sl}{
       <-> ssub * MontserratAlternates-TLF/medium/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
 }{}
 
 
@@ -57,235 +80,201 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
 
 %   ----  thin  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TLF/black/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/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{TS1}{MontserratAlternates-TLF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+      <-> alias * MontserratAlternates-TLF/thin/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TLF/thin/n
+      <-> alias * MontserratAlternates-TLF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TLF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{
-      <-> ssub * MontserratAlternates-TLF/extralight/n
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{
+      <-> alias * MontserratAlternates-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{
+      <-> alias * MontserratAlternates-TLF/extralight/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> alias * MontserratAlternates-TLF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+      <-> alias * 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}{l}{sl}{
+      <-> alias * MontserratAlternates-TLF/light/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{
+      <-> alias * MontserratAlternates-TLF/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
+      <-> alias * MontserratAlternates-TLF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/sl
+      <-> alias * MontserratAlternates-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{
-      <-> ssub * MontserratAlternates-TLF/medium/n
+      <-> alias * MontserratAlternates-TLF/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TLF/semibold/n
+      <-> alias * MontserratAlternates-TLF/semibold/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sl
+      <-> alias * MontserratAlternates-TLF/semibold/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+      <-> alias * MontserratAlternates-TLF/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+      <-> alias * MontserratAlternates-TLF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/sl
+      <-> alias * MontserratAlternates-TLF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{
-      <-> ssub * MontserratAlternates-TLF/bold/n
+      <-> alias * 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
+      <-> alias * MontserratAlternates-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/n
+      <-> alias * MontserratAlternates-TLF/extrabold/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TLF/extrabold/sl
+}{}
 
-%   ub --> black
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TLF/black/it
-}{}
+%   ub --> black
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/sl
+      <-> alias * MontserratAlternates-TLF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TLF/black/n
+      <-> alias * MontserratAlternates-TLF/black/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TLF/b/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> alias * MontserratAlternates-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{it}{
@@ -296,4 +285,8 @@
       <-> ssub * MontserratAlternates-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TLF/b/sl
+}{}
+
 \endinput