summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'fonts')
-rw-r--r--fonts/cabin/README2
-rw-r--r--fonts/cabin/latex/cabin.sty37
2 files changed, 16 insertions, 23 deletions
diff --git a/fonts/cabin/README b/fonts/cabin/README
index 47fa670e38..6f6a850f9f 100644
--- a/fonts/cabin/README
+++ b/fonts/cabin/README
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2020-07-15.
+This is the README for the cabin package, version 2020-07-18.
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/fonts/cabin/latex/cabin.sty b/fonts/cabin/latex/cabin.sty
index 266612754b..ac289579a9 100644
--- a/fonts/cabin/latex/cabin.sty
+++ b/fonts/cabin/latex/cabin.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2020/07/15 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2020/07/18 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -38,17 +38,10 @@
\ifcabin@otf
- \ifcabin@condensed
- \def\cabin@boldstyle{BoldCondensed}
- \ifcabin@semibold\def\cabin@boldstyle{SemiBoldCondensed}\fi
- \def\cabin@regstyle{RegularCondensed}
- \ifcabin@medium\def\cabin@regstyle{MediumCondensed}\fi
- \else
- \def\cabin@boldstyle{Bold}
- \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
- \def\cabin@regstyle{Regular}
- \ifcabin@medium\def\cabin@regstyle{Medium}\fi
- \fi
+ \def\cabin@boldstyle{Bold}
+ \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
+ \def\cabin@regstyle{Regular}
+ \ifcabin@medium\def\cabin@regstyle{Medium}\fi
\else % type1
@@ -73,19 +66,19 @@
\fi
\ifcabin@otf
- \def\cabin@regular{Regular}
- \def\cabin@semibold{SemiBold}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
Scale = \Cabin@scale ,
Extension = .otf }
+ \def\cabin@regular{Regular}
+ \def\cabin@semibold{SemiBold}
\ifcabin@condensed
\setsansfont
- [ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
- BoldFont = *-\cabin@boldstyle ,
- BoldItalicFont = *-\ifx\cabin@boldstyle\cabin@semibold Semibold\else\cabin@boldstyle\fi Italic ]
+ [ UprightFont = *-\cabin@regstyle Condensed,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi Condensed,
+ BoldFont = *-\cabin@boldstyle Condensed,
+ BoldItalicFont = *-\ifx\cabin@boldstyle\cabin@semibold Semibold\else\cabin@boldstyle\fi ItalicCondensed ]
{CabinCondensed}
\else
\setsansfont
@@ -105,10 +98,10 @@
BoldItalicFont = *-\cabin@boldstyle Italic ]
{Cabin}
\newfontfamily\cabincondensed
- [ UprightFont = *-\ifcabin@medium MediumCondensed\else RegularCondensed\fi,
- ItalicFont = *-\ifcabin@medium MediumItalicCondensed\else ItalicCondensed\fi,
- BoldFont = *-\ifcabin@semibold SemiBoldCondensed\else BoldCondensed\fi,
- BoldItalicFont = *-\ifcabin@semibold SemiboldItalicCondensed\else BoldItalicCondensed\fi]
+ [ UprightFont = *-\cabin@regstyle Condensed,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi Condensed,
+ BoldFont = *-\cabin@boldstyle Condensed,
+ BoldItalicFont = *-\ifx\cabin@boldstyle\cabin@semibold Semibold\else\cabin@boldstyle\fi ItalicCondensed ]
{CabinCondensed}
\else % type1
\def\cabinfamily{Cabin-TLF}