cabin (25dec22)

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

1 files changed, 12 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index e702fa19296..209f5b8f634 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -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@otf 
 \ifxetex
   \cabin@otftrue
@@ -13,6 +14,12 @@
   \cabin@otffalse
 \fi\fi
 
+\ifcabin@otf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
 \newif\ifcabin@default \cabin@defaultfalse
 \newif\ifcabin@lining \cabin@liningfalse
 \newif\ifcabin@tabular \cabin@tabularfalse
@@ -59,11 +66,7 @@
   \fi
 \fi
 
-\ifcabin@otf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+
 
 \ifcabin@otf
   \defaultfontfeatures{
@@ -112,8 +115,9 @@
     \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
     \mdseries
   }
-  \def\sfdefault{\cabinfamily}
-  \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
+  \edef\sfdefault{\cabinfamily}
+  \ifcabin@default\edef\familydefault{\cabinfamily}\edef\seriesdefault{\mdseries@sf}\fi
+
 \fi
 
 \ifcabin@otf