cabin (21oct19)

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

25 files changed, 137 insertions, 501 deletions

diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README
index 225f1d54c7b..bf84227b3f8 100644
--- a/Master/texmf-dist/doc/fonts/cabin/README
+++ b/Master/texmf-dist/doc/fonts/cabin/README
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2019-10-18.
+This is the README for the cabin package, version 2019-10-21.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Cabin and Cabin Condensed families of sans serif fonts, designed by 
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc
index 01886e8286c..dbe089f7098 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_2wmmq3.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_2wmmq3oozpiud56xhllpapxp5a
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:01 2019
 % Command line follows encoding
 /AutoEnc_2wmmq3oozpiud56xhllpapxp5a [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc
index 0b55ba903df..b6431dc8912 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5nrtpu.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5nrtpusnbrswxsqggsx5t7embc
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:02 2019
 % Command line follows encoding
 /AutoEnc_5nrtpusnbrswxsqggsx5t7embc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc
index 94dec22fcc3..5fb3254f19c 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_5xld5w.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c
-% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:02 2019
 % Command line follows encoding
 /AutoEnc_5xld5wrmxukokwwc7xt2m6qv4c [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc
index 8a2b2e28e2a..692f0666e87 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_fp7bit.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_fp7bitgpoju4haj2k5cvcskgig
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:01 2019
 % Command line follows encoding
 /AutoEnc_fp7bitgpoju4haj2k5cvcskgig [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc
index 624bdf20a21..a623c60357f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_hau3x5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_hau3x57gtxdzdvbsbvzpyrbxxf
-% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:02 2019
 % Command line follows encoding
 /AutoEnc_hau3x57gtxdzdvbsbvzpyrbxxf [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc
index 14a349bc1d7..6523fca7a8d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_i3ioen.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_i3ioen3bplo55fam3kxhynteph
-% Encoding created by otftotfm on Sat Oct 12 09:02:24 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:00 2019
 % Command line follows encoding
 /AutoEnc_i3ioen3bplo55fam3kxhynteph [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc
index 5339539c2a8..2f546432269 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_jjp77t.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb
-% Encoding created by otftotfm on Sat Oct 12 09:02:24 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:00 2019
 % Command line follows encoding
 /AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc
index 43de4effb75..f609b6ad107 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_meva6t.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_meva6tz2wd5yaptncgu6ryho4g
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:01 2019
 % Command line follows encoding
 /AutoEnc_meva6tz2wd5yaptncgu6ryho4g [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc
index ecdb7c9fd21..4d511680798 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_mvtsrz.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_mvtsrziu3qc7ulibw3r5ab5jcc
-% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:02 2019
 % Command line follows encoding
 /AutoEnc_mvtsrziu3qc7ulibw3r5ab5jcc [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc
index 39c35bb59e5..67d3bd1def3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_tz56ju.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_tz56jup5dthir6jy6y5ouoowsh
-% Encoding created by otftotfm on Sat Oct 12 09:02:29 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:06 2019
 % Command line follows encoding
 /AutoEnc_tz56jup5dthir6jy6y5ouoowsh [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc
index 5f72a592b14..88cbc007247 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqopxp.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vqopxpb44g7w7kf5cxambeuooe
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:01 2019
 % Command line follows encoding
 /AutoEnc_vqopxpb44g7w7kf5cxambeuooe [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc
index cc266e6015b..a5ea203c37e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_vqpkf5.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_vqpkf5uszgaieumdtwmphcxlcb
-% Encoding created by otftotfm on Sat Oct 12 09:02:26 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:02 2019
 % Command line follows encoding
 /AutoEnc_vqpkf5uszgaieumdtwmphcxlcb [
 %00
diff --git a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc
index da65d9393fe..f08642c0a97 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cabin/cbn_yhiurv.enc
@@ -1,7 +1,7 @@
 % THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
 
 %%AutoEnc_yhiurvsvbd3h7rarpdqq2tijsa
-% Encoding created by otftotfm on Sat Oct 12 09:02:25 2019
+% Encoding created by otftotfm on Mon Oct 21 08:18:01 2019
 % Command line follows encoding
 /AutoEnc_yhiurvsvbd3h7rarpdqq2tijsa [
 %00
diff --git a/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map b/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map
index 17dd538e7fd..50023db345f 100644
--- a/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map
+++ b/Master/texmf-dist/fonts/map/dvips/cabin/cabin.map
@@ -1,3 +1,5 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
 Cabin-BoldItalic-tlf-ot1 Cabin-BoldItalic "AutoEnc_jjp77tzr5q3rdiuqcjzmprtsvb ReEncodeFont" <[cbn_jjp77t.enc <Cabin-BoldItalic.pfb
 Cabin-BoldItalic-tlf-t1--base Cabin-BoldItalic "AutoEnc_i3ioen3bplo55fam3kxhynteph ReEncodeFont" <[cbn_i3ioen.enc <Cabin-BoldItalic.pfb
 Cabin-BoldItalic-tlf-ly1--base Cabin-BoldItalic "AutoEnc_fp7bitgpoju4haj2k5cvcskgig ReEncodeFont" <[cbn_fp7bit.enc <Cabin-BoldItalic.pfb
diff --git a/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
index 110bccbfe6c..781d3be9f51 100644
--- a/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LGRCabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{LGRCabin-Sup.fd}
-    [2019/10/12 (autoinst)  Font definitions for LGR/Cabin-Sup.]
+    [2019/10/21 (autoinst)  Font definitions for LGR/Cabin-Sup.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{sl}{
-      <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{n}{
-      <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{slc}{it}{
-      <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{sl}{
-      <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{n}{
-      <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-Sup}{sl}{it}{
-      <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{LGR}{Cabin-Sup}{c}{sl}{
-      <-> ssub * Cabin-Sup/mediumcondensed/sl
+      <-> ssub * Cabin-Sup/condensed/sl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-Sup}{c}{n}{
-      <-> ssub * Cabin-Sup/mediumcondensed/n
+      <-> ssub * Cabin-Sup/condensed/n
 }{}
 
 \DeclareFontShape{LGR}{Cabin-Sup}{c}{it}{
-      <-> ssub * Cabin-Sup/mediumcondensed/it
+      <-> ssub * Cabin-Sup/condensed/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LGR}{Cabin-Sup}{m}{sl}{
-      <-> ssub * Cabin-Sup/medium/sl
+      <-> ssub * Cabin-Sup/regular/sl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-Sup}{m}{n}{
-      <-> ssub * Cabin-Sup/medium/n
+      <-> ssub * Cabin-Sup/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Cabin-Sup}{m}{it}{
-      <-> ssub * Cabin-Sup/medium/it
+      <-> ssub * Cabin-Sup/regular/it
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
index ad14b4b3d11..7fd939ed012 100644
--- a/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LGRCabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{LGRCabin-TLF.fd}
-    [2019/10/12 (autoinst)  Font definitions for LGR/Cabin-TLF.]
+    [2019/10/21 (autoinst)  Font definitions for LGR/Cabin-TLF.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{sc}{
-      <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{slc}{scit}{
-      <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{scsl}{
-      <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{sc}{
-      <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{n}{
-      <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{it}{
-      <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{LGR}{Cabin-TLF}{sl}{scit}{
-      <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sl
+      <-> ssub * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{scsl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scsl
+      <-> ssub * Cabin-TLF/condensed/scsl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{sc}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sc
+      <-> ssub * Cabin-TLF/condensed/sc
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/mediumcondensed/n
+      <-> ssub * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/mediumcondensed/it
+      <-> ssub * Cabin-TLF/condensed/it
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{c}{scit}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scit
+      <-> ssub * Cabin-TLF/condensed/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/medium/sl
+      <-> ssub * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{scsl}{
-      <-> ssub * Cabin-TLF/medium/scsl
+      <-> ssub * Cabin-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{sc}{
-      <-> ssub * Cabin-TLF/medium/sc
+      <-> ssub * Cabin-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/medium/n
+      <-> ssub * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/medium/it
+      <-> ssub * Cabin-TLF/regular/it
 }{}
 
 \DeclareFontShape{LGR}{Cabin-TLF}{m}{scit}{
-      <-> ssub * Cabin-TLF/medium/scit
+      <-> ssub * Cabin-TLF/regular/scit
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
index 54f41c26cde..f686c60dbb7 100644
--- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{LY1Cabin-Sup.fd}
-    [2019/10/12 (autoinst)  Font definitions for LY1/Cabin-Sup.]
+    [2019/10/21 (autoinst)  Font definitions for LY1/Cabin-Sup.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{sl}{
-      <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{n}{
-      <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{slc}{it}{
-      <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{sl}{
-      <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{n}{
-      <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-Sup}{sl}{it}{
-      <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{
-      <-> ssub * Cabin-Sup/mediumcondensed/sl
+      <-> ssub * Cabin-Sup/condensed/sl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{
-      <-> ssub * Cabin-Sup/mediumcondensed/n
+      <-> ssub * Cabin-Sup/condensed/n
 }{}
 
 \DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{
-      <-> ssub * Cabin-Sup/mediumcondensed/it
+      <-> ssub * Cabin-Sup/condensed/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{
-      <-> ssub * Cabin-Sup/medium/sl
+      <-> ssub * Cabin-Sup/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{
-      <-> ssub * Cabin-Sup/medium/n
+      <-> ssub * Cabin-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{
-      <-> ssub * Cabin-Sup/medium/it
+      <-> ssub * Cabin-Sup/regular/it
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
index 7972b7842b2..15321079672 100644
--- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{LY1Cabin-TLF.fd}
-    [2019/10/12 (autoinst)  Font definitions for LY1/Cabin-TLF.]
+    [2019/10/21 (autoinst)  Font definitions for LY1/Cabin-TLF.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{sc}{
-      <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{slc}{scit}{
-      <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scsl}{
-      <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{sc}{
-      <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{n}{
-      <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{it}{
-      <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{Cabin-TLF}{sl}{scit}{
-      <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sl
+      <-> ssub * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scsl
+      <-> ssub * Cabin-TLF/condensed/scsl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sc
+      <-> ssub * Cabin-TLF/condensed/sc
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/mediumcondensed/n
+      <-> ssub * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/mediumcondensed/it
+      <-> ssub * Cabin-TLF/condensed/it
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scit
+      <-> ssub * Cabin-TLF/condensed/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/medium/sl
+      <-> ssub * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{
-      <-> ssub * Cabin-TLF/medium/scsl
+      <-> ssub * Cabin-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{
-      <-> ssub * Cabin-TLF/medium/sc
+      <-> ssub * Cabin-TLF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/medium/n
+      <-> ssub * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/medium/it
+      <-> ssub * Cabin-TLF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{
-      <-> ssub * Cabin-TLF/medium/scit
+      <-> ssub * Cabin-TLF/regular/scit
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
index 9891ba0ee6a..eb6f39195ef 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{OT1Cabin-Sup.fd}
-    [2019/10/12 (autoinst)  Font definitions for OT1/Cabin-Sup.]
+    [2019/10/21 (autoinst)  Font definitions for OT1/Cabin-Sup.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{sl}{
-      <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{n}{
-      <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{slc}{it}{
-      <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{sl}{
-      <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{n}{
-      <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-Sup}{sl}{it}{
-      <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{
-      <-> ssub * Cabin-Sup/mediumcondensed/sl
+      <-> ssub * Cabin-Sup/condensed/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{
-      <-> ssub * Cabin-Sup/mediumcondensed/n
+      <-> ssub * Cabin-Sup/condensed/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{
-      <-> ssub * Cabin-Sup/mediumcondensed/it
+      <-> ssub * Cabin-Sup/condensed/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{
-      <-> ssub * Cabin-Sup/medium/sl
+      <-> ssub * Cabin-Sup/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{
-      <-> ssub * Cabin-Sup/medium/n
+      <-> ssub * Cabin-Sup/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{
-      <-> ssub * Cabin-Sup/medium/it
+      <-> ssub * Cabin-Sup/regular/it
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
index d21164a7762..9dfbb17f9b6 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{OT1Cabin-TLF.fd}
-    [2019/10/12 (autoinst)  Font definitions for OT1/Cabin-TLF.]
+    [2019/10/21 (autoinst)  Font definitions for OT1/Cabin-TLF.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{sc}{
-      <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{slc}{scit}{
-      <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scsl}{
-      <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{sc}{
-      <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{n}{
-      <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{it}{
-      <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{Cabin-TLF}{sl}{scit}{
-      <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sl
+      <-> ssub * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scsl
+      <-> ssub * Cabin-TLF/condensed/scsl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sc
+      <-> ssub * Cabin-TLF/condensed/sc
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/mediumcondensed/n
+      <-> ssub * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/mediumcondensed/it
+      <-> ssub * Cabin-TLF/condensed/it
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scit
+      <-> ssub * Cabin-TLF/condensed/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/medium/sl
+      <-> ssub * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
-      <-> ssub * Cabin-TLF/medium/scsl
+      <-> ssub * Cabin-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{
-      <-> ssub * Cabin-TLF/medium/sc
+      <-> ssub * Cabin-TLF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/medium/n
+      <-> ssub * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/medium/it
+      <-> ssub * Cabin-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{
-      <-> ssub * Cabin-TLF/medium/scit
+      <-> ssub * Cabin-TLF/regular/scit
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
index 861eca637c7..e36ceec83ae 100644
--- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
+++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{T1Cabin-Sup.fd}
-    [2019/10/12 (autoinst)  Font definitions for T1/Cabin-Sup.]
+    [2019/10/21 (autoinst)  Font definitions for T1/Cabin-Sup.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{sl}{
-      <-> ssub * Cabin-Sup/condensed/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{n}{
-      <-> ssub * Cabin-Sup/condensed/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{slc}{it}{
-      <-> ssub * Cabin-Sup/condensed/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{sl}{
-      <-> ssub * Cabin-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{n}{
-      <-> ssub * Cabin-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-Sup}{sl}{it}{
-      <-> ssub * Cabin-Sup/regular/it
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{
-      <-> ssub * Cabin-Sup/mediumcondensed/sl
+      <-> ssub * Cabin-Sup/condensed/sl
 }{}
 
 \DeclareFontShape{T1}{Cabin-Sup}{c}{n}{
-      <-> ssub * Cabin-Sup/mediumcondensed/n
+      <-> ssub * Cabin-Sup/condensed/n
 }{}
 
 \DeclareFontShape{T1}{Cabin-Sup}{c}{it}{
-      <-> ssub * Cabin-Sup/mediumcondensed/it
+      <-> ssub * Cabin-Sup/condensed/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{
-      <-> ssub * Cabin-Sup/medium/sl
+      <-> ssub * Cabin-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Cabin-Sup}{m}{n}{
-      <-> ssub * Cabin-Sup/medium/n
+      <-> ssub * Cabin-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{Cabin-Sup}{m}{it}{
-      <-> ssub * Cabin-Sup/medium/it
+      <-> ssub * Cabin-Sup/regular/it
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
index 42f9cc5c8c1..9a7a30fc0d2 100644
--- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{T1Cabin-TLF.fd}
-    [2019/10/12 (autoinst)  Font definitions for T1/Cabin-TLF.]
+    [2019/10/21 (autoinst)  Font definitions for T1/Cabin-TLF.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -231,111 +231,57 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{scsl}{
-      <-> ssub * Cabin-TLF/condensed/scsl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{sc}{
-      <-> ssub * Cabin-TLF/condensed/sc
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{slc}{scit}{
-      <-> ssub * Cabin-TLF/condensed/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{scsl}{
-      <-> ssub * Cabin-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{sc}{
-      <-> ssub * Cabin-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{n}{
-      <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{it}{
-      <-> ssub * Cabin-TLF/regular/it
-}{}
-
-\DeclareFontShape{T1}{Cabin-TLF}{sl}{scit}{
-      <-> ssub * Cabin-TLF/regular/scit
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sl
+      <-> ssub * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scsl
+      <-> ssub * Cabin-TLF/condensed/scsl
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sc
+      <-> ssub * Cabin-TLF/condensed/sc
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/mediumcondensed/n
+      <-> ssub * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/mediumcondensed/it
+      <-> ssub * Cabin-TLF/condensed/it
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{
-      <-> ssub * Cabin-TLF/mediumcondensed/scit
+      <-> ssub * Cabin-TLF/condensed/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/medium/sl
+      <-> ssub * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{
-      <-> ssub * Cabin-TLF/medium/scsl
+      <-> ssub * Cabin-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{
-      <-> ssub * Cabin-TLF/medium/sc
+      <-> ssub * Cabin-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/medium/n
+      <-> ssub * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/medium/it
+      <-> ssub * Cabin-TLF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{
-      <-> ssub * Cabin-TLF/medium/scit
+      <-> ssub * Cabin-TLF/regular/scit
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
index 527323bc930..62f4c2e7a0e 100644
--- a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/10/12
+%% Generated by autoinst on 2019/10/21
 %%
 \ProvidesFile{TS1Cabin-TLF.fd}
-    [2019/10/12 (autoinst)  Font definitions for TS1/Cabin-TLF.]
+    [2019/10/21 (autoinst)  Font definitions for TS1/Cabin-TLF.]
 
 \expandafter\ifx\csname Cabin@scale\endcsname\relax
     \let\Cabin@@scale\@empty
@@ -135,63 +135,33 @@
 %  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
 %
 
-%   slc --> condensed
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{sl}{
-      <-> ssub * Cabin-TLF/condensed/sl
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{n}{
-      <-> ssub * Cabin-TLF/condensed/n
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{slc}{it}{
-      <-> ssub * Cabin-TLF/condensed/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{sl}{
-      <-> ssub * Cabin-TLF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{n}{
-      <-> ssub * Cabin-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Cabin-TLF}{sl}{it}{
-      <-> ssub * Cabin-TLF/regular/it
-}{}
-
-
-%   c --> mediumcondensed
+%   c --> condensed
 
 \DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{
-      <-> ssub * Cabin-TLF/mediumcondensed/sl
+      <-> ssub * Cabin-TLF/condensed/sl
 }{}
 
 \DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{
-      <-> ssub * Cabin-TLF/mediumcondensed/n
+      <-> ssub * Cabin-TLF/condensed/n
 }{}
 
 \DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{
-      <-> ssub * Cabin-TLF/mediumcondensed/it
+      <-> ssub * Cabin-TLF/condensed/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{
-      <-> ssub * Cabin-TLF/medium/sl
+      <-> ssub * Cabin-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{
-      <-> ssub * Cabin-TLF/medium/n
+      <-> ssub * Cabin-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{
-      <-> ssub * Cabin-TLF/medium/it
+      <-> ssub * Cabin-TLF/regular/it
 }{}
 
 
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index afff4ba3340..af101920617 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cabin}
-    [2019/10/18 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2019/10/21 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -47,14 +47,14 @@
   \ifcabin@condensed
     \def\bfseries@sf{bc}
     \ifcabin@semibold\def\bfseries@sf{sbc}\fi
-    \def\mdseries@sf{slc}
-    \ifcabin@medium\def\mdseries@sf{c}\fi
+    \def\mdseries@sf{c}
+    \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
     \def\seriesdefault{\mdseries@sf}
   \else
     \def\bfseries@sf{b}
     \ifcabin@semibold\def\bfseries@sf{sb}\fi
-    \def\mdseries@sf{sl}
-    \ifcabin@medium\def\mdseries@sf{m}\fi
+    \def\mdseries@sf{m}
+    \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
   \fi
 \fi
 
@@ -107,8 +107,8 @@
   \newcommand*\cabincondensed{%
     \def\bfseries@sf{bc}
     \ifcabin@semibold\def\bfseries@sf{sbc}\fi
-    \def\mdseries@sf{slc}
-    \ifcabin@medium\def\mdseries@sf{c}\fi
+    \def\mdseries@sf{c}
+    \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
     \mdseries
   }
   \def\sfdefault{\cabinfamily}