texlive[65358] Master/texmf-dist: cabin (25dec22)

[commits+karl at tug.org]

Revision: 65358
          http://tug.org/svn/texlive?view=revision&revision=65358
Author:   karl
Date:     2022-12-25 22:19:50 +0100 (Sun, 25 Dec 2022)
Log Message:
-----------
cabin (25dec22)

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	2022-12-25 21:19:05 UTC (rev 65357)
+++ trunk/Master/texmf-dist/doc/fonts/cabin/README	2022-12-25 21:19:50 UTC (rev 65358)
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2022-09-13.
+This is the README for the cabin package, version 2022-12-24.
 
 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	2022-12-25 21:19:05 UTC (rev 65357)
+++ trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty	2022-12-25 21:19:50 UTC (rev 65358)
@@ -1,9 +1,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cabin}
-    [2022/09/13 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2022/12/24 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
+
 \newif\ifcabin at otf 
 \ifxetex
   \cabin at otftrue
@@ -13,6 +14,12 @@
   \cabin at otffalse
 \fi\fi
 
+\ifcabin at otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
 \newif\ifcabin at default \cabin at defaultfalse
 \newif\ifcabin at lining \cabin at liningfalse
 \newif\ifcabin at tabular \cabin at tabularfalse
@@ -59,12 +66,8 @@
   \fi
 \fi
 
-\ifcabin at otf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes,mweights}
-\fi
 
+
 \ifcabin at otf
   \defaultfontfeatures{
         Ligatures = TeX ,
@@ -112,8 +115,9 @@
     \ifcabin at medium\def\mdseries at sf{mediumcondensed}\fi
     \mdseries
   }
-  \def\sfdefault{\cabinfamily}
-  \ifcabin at default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries at sf}\fi
+  \edef\sfdefault{\cabinfamily}
+  \ifcabin at default\edef\familydefault{\cabinfamily}\edef\seriesdefault{\mdseries at sf}\fi
+
 \fi
 
 \ifcabin at otf