texlive[68373] Master/texmf-dist: cabin (26sep23)

[commits+karl at tug.org]

Revision: 68373
          https://tug.org/svn/texlive?view=revision&revision=68373
Author:   karl
Date:     2023-09-26 22:04:02 +0200 (Tue, 26 Sep 2023)
Log Message:
-----------
cabin (26sep23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/cabin/README
    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	2023-09-26 14:48:58 UTC (rev 68372)
+++ trunk/Master/texmf-dist/doc/fonts/cabin/README	2023-09-26 20:04:02 UTC (rev 68373)
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2022-12-24.
+This is the README for the cabin package, version 2023-09-25.
 
 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/tex/latex/cabin/cabin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty	2023-09-26 14:48:58 UTC (rev 68372)
+++ trunk/Master/texmf-dist/tex/latex/cabin/cabin.sty	2023-09-26 20:04:02 UTC (rev 68373)
@@ -1,10 +1,9 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cabin}
-    [2022/12/24 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2023/09/25 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
-
 \newif\ifcabin at otf 
 \ifxetex
   \cabin at otftrue
@@ -14,12 +13,6 @@
   \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
@@ -43,8 +36,15 @@
 \ExecuteOptionsX{bold,regular}
 \ProcessOptionsX\relax
 
+
 \ifcabin at otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes,mweights}
+\fi
 
+\ifcabin at otf
+
   \def\cabin at boldstyle{Bold}
   \ifcabin at semibold\def\cabin at boldstyle{SemiBold}\fi
   \def\cabin at regstyle{Regular}
@@ -66,9 +66,8 @@
   \fi
 \fi
 
-
-
 \ifcabin at otf
+  \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
         Ligatures = TeX ,
         Scale     = \Cabin at scale ,
@@ -115,9 +114,8 @@
     \ifcabin at medium\def\mdseries at sf{mediumcondensed}\fi
     \mdseries
   }
-  \edef\sfdefault{\cabinfamily}
-  \ifcabin at default\edef\familydefault{\cabinfamily}\edef\seriesdefault{\mdseries at sf}\fi
-
+  \def\sfdefault{\cabinfamily}
+  \ifcabin at default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries at sf}\fi
 \fi
 
 \ifcabin at otf