texlive[55867] Master/texmf-dist: cabin (18jul20)

[commits+karl at tug.org]

Revision: 55867
          http://tug.org/svn/texlive?view=revision&revision=55867
Author:   karl
Date:     2020-07-18 23:35:34 +0200 (Sat, 18 Jul 2020)
Log Message:
-----------
cabin (18jul20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/cabin/README
    trunk/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf
    trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty

Modified: trunk/Master/texmf-dist/doc/fonts/cabin/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/cabin/README	2020-07-18 16:28:29 UTC (rev 55866)
+++ trunk/Master/texmf-dist/doc/fonts/cabin/README	2020-07-18 21:35:34 UTC (rev 55867)
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2020-07-15.
+This is the README for the cabin package, version 2020-07-18.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Cabin and Cabin Condensed families of sans serif fonts, designed by 

Modified: trunk/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty	2020-07-18 16:28:29 UTC (rev 55866)
+++ trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty	2020-07-18 21:35:34 UTC (rev 55867)
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cabin}
-    [2020/07/15 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2020/07/18 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -38,17 +38,10 @@
 
 \ifcabin at otf
 
-  \ifcabin at condensed
-    \def\cabin at boldstyle{BoldCondensed}
-    \ifcabin at semibold\def\cabin at boldstyle{SemiBoldCondensed}\fi
-    \def\cabin at regstyle{RegularCondensed}
-    \ifcabin at medium\def\cabin at regstyle{MediumCondensed}\fi
-  \else
-    \def\cabin at boldstyle{Bold}
-    \ifcabin at semibold\def\cabin at boldstyle{SemiBold}\fi
-    \def\cabin at regstyle{Regular}
-    \ifcabin at medium\def\cabin at regstyle{Medium}\fi
-  \fi
+  \def\cabin at boldstyle{Bold}
+  \ifcabin at semibold\def\cabin at boldstyle{SemiBold}\fi
+  \def\cabin at regstyle{Regular}
+  \ifcabin at medium\def\cabin at regstyle{Medium}\fi
 
 \else % type1
 
@@ -73,19 +66,19 @@
 \fi
 
 \ifcabin at otf
-  \def\cabin at regular{Regular}
-  \def\cabin at semibold{SemiBold}
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \Cabin at scale ,
         Extension = .otf }
+  \def\cabin at regular{Regular}
+  \def\cabin at semibold{SemiBold}
   \ifcabin at condensed
     \setsansfont
-        [ UprightFont    = *-\cabin at regstyle ,
-          ItalicFont     = *-\ifx\cabin at regstyle\cabin at regular Italic\else\cabin at regstyle Italic\fi ,
-          BoldFont       = *-\cabin at boldstyle , 
-          BoldItalicFont = *-\ifx\cabin at boldstyle\cabin at semibold Semibold\else\cabin at boldstyle\fi Italic ]
+        [ UprightFont    = *-\cabin at regstyle Condensed,
+          ItalicFont     = *-\ifx\cabin at regstyle\cabin at regular Italic\else\cabin at regstyle Italic\fi Condensed,
+          BoldFont       = *-\cabin at boldstyle Condensed, 
+          BoldItalicFont = *-\ifx\cabin at boldstyle\cabin at semibold Semibold\else\cabin at boldstyle\fi ItalicCondensed ]
         {CabinCondensed}
   \else
     \setsansfont
@@ -105,10 +98,10 @@
           BoldItalicFont = *-\cabin at boldstyle Italic ]
         {Cabin}
   \newfontfamily\cabincondensed
-        [ UprightFont    = *-\ifcabin at medium MediumCondensed\else RegularCondensed\fi,
-          ItalicFont     = *-\ifcabin at medium MediumItalicCondensed\else ItalicCondensed\fi, 
-          BoldFont       = *-\ifcabin at semibold SemiBoldCondensed\else BoldCondensed\fi,
-          BoldItalicFont = *-\ifcabin at semibold SemiboldItalicCondensed\else BoldItalicCondensed\fi]
+        [ UprightFont    = *-\cabin at regstyle Condensed,
+          ItalicFont     = *-\ifx\cabin at regstyle\cabin at regular Italic\else\cabin at regstyle Italic\fi Condensed,
+          BoldFont       = *-\cabin at boldstyle Condensed, 
+          BoldItalicFont = *-\ifx\cabin at boldstyle\cabin at semibold Semibold\else\cabin at boldstyle\fi ItalicCondensed ]
         {CabinCondensed}
 \else % type1
   \def\cabinfamily{Cabin-TLF}