diff options
author | Karl Berry <karl@freefriends.org> | 2023-09-26 20:04:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-09-26 20:04:02 +0000 |
commit | cf0576e556b99490707b718f5087e22a822be5c3 (patch) | |
tree | a491535ca4a838d5ec141050f027033a58ed3145 | |
parent | c59c5d0dd53cca8ed057ca91d7014dff40a97bae (diff) |
cabin (26sep23)
git-svn-id: svn://tug.org/texlive/trunk@68373 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/fonts/cabin/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cabin/cabin.sty | 24 |
2 files changed, 12 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README index cc4a6f05797..6e3f7612b7d 100644 --- a/Master/texmf-dist/doc/fonts/cabin/README +++ b/Master/texmf-dist/doc/fonts/cabin/README @@ -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 diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty index 209f5b8f634..5baef158ef3 100644 --- a/Master/texmf-dist/tex/latex/cabin/cabin.sty +++ b/Master/texmf-dist/tex/latex/cabin/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 |