diff options
author | Norbert Preining <norbert@preining.info> | 2022-12-26 03:03:16 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-12-26 03:03:16 +0000 |
commit | 200df2fd74322d3c7b4bb2a69e711a40265ead1b (patch) | |
tree | 9a545919fa0f041b8bac6341e8afb7b7b555ff8e /fonts/cabin/latex | |
parent | 90ef58ebc56f69220f860d466e1e21ed68ce9a55 (diff) |
CTAN sync 202212260303
Diffstat (limited to 'fonts/cabin/latex')
-rw-r--r-- | fonts/cabin/latex/cabin.sty | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fonts/cabin/latex/cabin.sty b/fonts/cabin/latex/cabin.sty index e702fa1929..209f5b8f63 100644 --- a/fonts/cabin/latex/cabin.sty +++ b/fonts/cabin/latex/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 |