1 files changed, 20 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index af101920617..266612754b4 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/21 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2020/07/15 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -37,10 +37,18 @@
 \ProcessOptionsX\relax
 
 \ifcabin@otf
-  \def\cabin@boldstyle{Bold}
-  \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
-  \def\cabin@regstyle{Regular}
-  \ifcabin@medium\def\cabin@regstyle{Medium}\fi
+
+  \ifcabin@condensed
+    \def\cabin@boldstyle{BoldCondensed}
+    \ifcabin@semibold\def\cabin@boldstyle{SemiBoldCondensed}\fi
+    \def\cabin@regstyle{RegularCondensed}
+    \ifcabin@medium\def\cabin@regstyle{MediumCondensed}\fi
+  \else
+    \def\cabin@boldstyle{Bold}
+    \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
+    \def\cabin@regstyle{Regular}
+    \ifcabin@medium\def\cabin@regstyle{Medium}\fi
+  \fi
 
 \else % type1
 
@@ -54,7 +62,7 @@
     \def\bfseries@sf{b}
     \ifcabin@semibold\def\bfseries@sf{sb}\fi
     \def\mdseries@sf{m}
-    \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
+    \ifcabin@medium\def\mdseries@sf{medium}\fi
   \fi
 \fi
 
@@ -66,6 +74,7 @@
 
 \ifcabin@otf
   \def\cabin@regular{Regular}
+  \def\cabin@semibold{SemiBold}
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
@@ -76,7 +85,7 @@
         [ UprightFont    = *-\cabin@regstyle ,
           ItalicFont     = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
           BoldFont       = *-\cabin@boldstyle , 
-          BoldItalicFont = *-\cabin@boldstyle Italic ]
+          BoldItalicFont = *-\ifx\cabin@boldstyle\cabin@semibold Semibold\else\cabin@boldstyle\fi Italic ]
         {CabinCondensed}
   \else
     \setsansfont
@@ -96,10 +105,10 @@
           BoldItalicFont = *-\cabin@boldstyle Italic ]
         {Cabin}
   \newfontfamily\cabincondensed
-        [ UprightFont    = *-\cabin@regstyle ,
-          ItalicFont     = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
-          BoldFont       = *-\cabin@boldstyle , 
-          BoldItalicFont = *-\cabin@boldstyle Italic ]
+        [ UprightFont    = *-\ifcabin@medium MediumCondensed\else RegularCondensed\fi,
+          ItalicFont     = *-\ifcabin@medium MediumItalicCondensed\else ItalicCondensed\fi, 
+          BoldFont       = *-\ifcabin@semibold SemiBoldCondensed\else BoldCondensed\fi,
+          BoldItalicFont = *-\ifcabin@semibold SemiboldItalicCondensed\else BoldItalicCondensed\fi]
         {CabinCondensed}
 \else % type1
   \def\cabinfamily{Cabin-TLF}