cabin (15jul20)

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

1 files changed, 46 insertions, 122 deletions

diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
index 9dfbb17f9b6..c9e0354629b 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/21
+%% Generated by autoinst on 2020/07/15
 %%
 \ProvidesFile{OT1Cabin-TLF.fd}
-    [2019/10/21 (autoinst)  Font definitions for OT1/Cabin-TLF.]
+    [2020/07/15 (autoinst)  Font definitions for OT1/Cabin-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 Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -95,24 +103,12 @@
 
 %   ----  boldcondensed  ----
 
-\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sc}{
-      <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{n}{
-      <-> \Cabin@@scale CabinCondensed-Bold-tlf-ot1
+      <-> \Cabin@@scale CabinCondensed-BoldCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{it}{
-      <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scit}{
-      <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scsl}{
-      <-> ssub * Cabin-TLF/boldcondensed/scit
+      <-> \Cabin@@scale CabinCondensed-BoldItalicCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sl}{
@@ -122,24 +118,12 @@
 
 %   ----  condensed  ----
 
-\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sc}{
-      <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{n}{
-      <-> \Cabin@@scale CabinCondensed-Regular-tlf-ot1
+      <-> \Cabin@@scale CabinCondensed-RegularCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{it}{
-      <-> \Cabin@@scale CabinCondensed-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scit}{
-      <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scit
+      <-> \Cabin@@scale CabinCondensed-ItalicCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sl}{
@@ -176,24 +160,12 @@
 
 %   ----  mediumcondensed  ----
 
-\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sc}{
-      <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{n}{
-      <-> \Cabin@@scale CabinCondensed-Medium-tlf-ot1
+      <-> \Cabin@@scale CabinCondensed-MediumCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{it}{
-      <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scit}{
-      <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scsl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scit
+      <-> \Cabin@@scale CabinCondensed-MediumItalicCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sl}{
@@ -203,24 +175,12 @@
 
 %   ----  semiboldcondensed  ----
 
-\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sc}{
-      <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{n}{
-      <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ot1
+      <-> \Cabin@@scale CabinCondensed-SemiBoldCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{it}{
-      <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scit}{
-      <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scsl}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/scit
+      <-> \Cabin@@scale CabinCondensed-SemiboldItalicCondensed-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sl}{
@@ -228,168 +188,132 @@
 }{}
 
 %
-%  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
 %
 
 %   c --> condensed
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{
-      <-> ssub * Cabin-TLF/condensed/sc
+      <-> alias * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
+      <-> alias * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{
-      <-> ssub * Cabin-TLF/condensed/scit
+      <-> alias * Cabin-TLF/condensed/it
 }{}
 
 
 %   m --> regular
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
+      <-> alias * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
-      <-> ssub * Cabin-TLF/regular/scsl
+      <-> alias * Cabin-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{
-      <-> ssub * Cabin-TLF/regular/sc
+      <-> alias * Cabin-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/regular/n
+      <-> alias * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/regular/it
+      <-> alias * Cabin-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{
-      <-> ssub * Cabin-TLF/regular/scit
+      <-> alias * Cabin-TLF/regular/scit
 }{}
 
 
 %   sbc --> semiboldcondensed
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sl}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scsl}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sc}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/sc
+      <-> alias * Cabin-TLF/semiboldcondensed/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{n}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/n
+      <-> alias * Cabin-TLF/semiboldcondensed/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sbc}{it}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scit}{
-      <-> ssub * Cabin-TLF/semiboldcondensed/scit
+      <-> alias * Cabin-TLF/semiboldcondensed/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{
-      <-> ssub * Cabin-TLF/semibold/sl
+      <-> alias * Cabin-TLF/semibold/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{
-      <-> ssub * Cabin-TLF/semibold/scsl
+      <-> alias * Cabin-TLF/semibold/scsl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{
-      <-> ssub * Cabin-TLF/semibold/sc
+      <-> alias * Cabin-TLF/semibold/sc
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{n}{
-      <-> ssub * Cabin-TLF/semibold/n
+      <-> alias * Cabin-TLF/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{it}{
-      <-> ssub * Cabin-TLF/semibold/it
+      <-> alias * Cabin-TLF/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{
-      <-> ssub * Cabin-TLF/semibold/scit
+      <-> alias * Cabin-TLF/semibold/scit
 }{}
 
 
 %   bc --> boldcondensed
 
 \DeclareFontShape{OT1}{Cabin-TLF}{bc}{sl}{
-      <-> ssub * Cabin-TLF/boldcondensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scsl}{
-      <-> ssub * Cabin-TLF/boldcondensed/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{bc}{sc}{
-      <-> ssub * Cabin-TLF/boldcondensed/sc
+      <-> alias * Cabin-TLF/boldcondensed/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{bc}{n}{
-      <-> ssub * Cabin-TLF/boldcondensed/n
+      <-> alias * Cabin-TLF/boldcondensed/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{bc}{it}{
-      <-> ssub * Cabin-TLF/boldcondensed/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scit}{
-      <-> ssub * Cabin-TLF/boldcondensed/scit
+      <-> alias * Cabin-TLF/boldcondensed/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{
-      <-> ssub * Cabin-TLF/bold/sl
+      <-> alias * Cabin-TLF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{
-      <-> ssub * Cabin-TLF/bold/scsl
+      <-> alias * Cabin-TLF/bold/scsl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{
-      <-> ssub * Cabin-TLF/bold/sc
+      <-> alias * Cabin-TLF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{
-      <-> ssub * Cabin-TLF/bold/n
+      <-> alias * Cabin-TLF/bold/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{
-      <-> ssub * Cabin-TLF/bold/it
+      <-> alias * Cabin-TLF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{
-      <-> ssub * Cabin-TLF/bold/scit
+      <-> alias * Cabin-TLF/bold/scit
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{