diff options
author | Norbert Preining <norbert@preining.info> | 2023-09-26 03:01:14 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-09-26 03:01:14 +0000 |
commit | 48486f016a3101e6a13547bf0d44e210fedfbacf (patch) | |
tree | 82e32650576597bf136bc964af7ea88d975a02f6 /fonts/cabin/latex/cabin.sty | |
parent | 9a8ccd95ca1117b976453194f16ad53dd02949ad (diff) |
CTAN sync 202309260301
Diffstat (limited to 'fonts/cabin/latex/cabin.sty')
-rw-r--r-- | fonts/cabin/latex/cabin.sty | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/fonts/cabin/latex/cabin.sty b/fonts/cabin/latex/cabin.sty index 209f5b8f63..5baef158ef 100644 --- a/fonts/cabin/latex/cabin.sty +++ b/fonts/cabin/latex/cabin.sty @@ -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@otf \ifxetex \cabin@otftrue @@ -14,12 +13,6 @@ \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 @@ -43,6 +36,13 @@ \ExecuteOptionsX{bold,regular} \ProcessOptionsX\relax + +\ifcabin@otf + \RequirePackage{fontspec} +\else + \RequirePackage{fontenc,fontaxes,mweights} +\fi + \ifcabin@otf \def\cabin@boldstyle{Bold} @@ -66,9 +66,8 @@ \fi \fi - - \ifcabin@otf + \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , Scale = \Cabin@scale , @@ -115,9 +114,8 @@ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi \mdseries } - \edef\sfdefault{\cabinfamily} - \ifcabin@default\edef\familydefault{\cabinfamily}\edef\seriesdefault{\mdseries@sf}\fi - + \def\sfdefault{\cabinfamily} + \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi \fi \ifcabin@otf |