diff options
author | Karl Berry <karl@freefriends.org> | 2019-05-02 22:36:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-05-02 22:36:31 +0000 |
commit | c334b6a3c7a2b6b53e9f3e26f795391362789d90 (patch) | |
tree | 834ac69d6b725943ceea253b776993bf81f11acd /Master/texmf-dist/tex/latex/cabin/cabin.sty | |
parent | 7bc0bf02498215ec195313bf4aa15d697fdf549f (diff) |
cabin (26apr19)
git-svn-id: svn://tug.org/texlive/trunk@50936 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cabin/cabin.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/cabin/cabin.sty | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty index 1910e4445dd..72642b0534e 100644 --- a/Master/texmf-dist/tex/latex/cabin/cabin.sty +++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{cabin} - [2019/04/04 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] + [2019/04/24 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -21,9 +21,8 @@ \newif\ifcabin@condensed \cabin@condensedfalse \newcommand*{\Cabin@scale}{1} -\newcommand*{\CabinCondensed@scale}{1} -\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}} \DeclareOptionX{default}{\cabin@defaulttrue} \DeclareOptionX{sfdefault}{\cabin@defaulttrue} @@ -45,10 +44,17 @@ \else % type1 - \def\bfseries@sf{bold} - \ifcabin@semibold\def\bfseries@sf{semibold}\fi - \def\mdseries@sf{regular} - \ifcabin@medium\def\mdseries@sf{medium}\fi + \ifcabin@condensed + \def\bfseries@sf{boldcondensed} + \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi + \def\mdseries@sf{condensed} + \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi + \else + \def\bfseries@sf{bold} + \ifcabin@semibold\def\bfseries@sf{semibold}\fi + \def\mdseries@sf{regular} + \ifcabin@medium\def\mdseries@sf{medium}\fi + \fi \fi \ifcabin@otf @@ -96,11 +102,14 @@ {CabinCondensed} \else % type1 \def\cabinfamily{Cabin-TLF} - \def\cabincondensedfamily{CabinCondensed-TLF} \newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont} - \newcommand*\cabincondensed{\fontfamily{\cabincondensedfamily}\selectfont} + \newcommand*\cabincondensed{% + \def\bfseries@sf{boldcondensed} + \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi + \def\mdseries@sf{condensed} + \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi + } \def\sfdefault{\cabinfamily} - \ifcabin@condensed\def\sfdefault{\cabincondensedfamily}\fi \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi \fi |