summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cabin/cabin.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/cabin/cabin.sty')
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index 7da0e9e59fb..ccae8e7db54 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}
- [2016/02/26 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2018/05/18 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -21,7 +21,7 @@
\newif\ifcabin@condensed \cabin@condensedfalse
\newcommand*{\Cabin@scale}{1}
-\newcommand*{\CabinCondensed@scale}{1} % corrections by Andreas Ahlrich 2016-02-26
+\newcommand*{\CabinCondensed@scale}{1}
\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
@@ -58,6 +58,7 @@
\fi
\ifcabin@otf
+ \def\cabin@regular{Regular}
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
@@ -66,14 +67,14 @@
\ifcabin@condensed
\setsansfont
[ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\cabin@regstyle Italic ,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
BoldFont = *-\cabin@boldstyle ,
BoldItalicFont = *-\cabin@boldstyle Italic ]
{CabinCondensed}
\else
\setsansfont
[ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\cabin@regstyle Italic ,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
BoldFont = *-\cabin@boldstyle ,
BoldItalicFont = *-\cabin@boldstyle Italic ]
{Cabin}
@@ -83,13 +84,13 @@
\ifcabin@default\renewcommand*\familydefault{\cabinfamily}\fi
\newfontfamily\cabin
[ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\cabin@regstyle Italic ,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
BoldFont = *-\cabin@boldstyle ,
BoldItalicFont = *-\cabin@boldstyle Italic ]
{Cabin}
\newfontfamily\cabincondensed
[ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\cabin@regstyle Italic ,
+ ItalicFont = *-\ifx\cabin@regstyle\cabin@regular Italic\else\cabin@regstyle Italic\fi ,
BoldFont = *-\cabin@boldstyle ,
BoldItalicFont = *-\cabin@boldstyle Italic ]
{CabinCondensed}