diff options
author | Karl Berry <karl@freefriends.org> | 2013-06-24 23:44:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-06-24 23:44:24 +0000 |
commit | e0e554f28ccb5ff16ccfbae8db39edddef21f08f (patch) | |
tree | cd3819a0ebcd28cb5629ab7a0855ca17a14c9d4f /Master/texmf-dist/tex/latex/cabin | |
parent | d43e41d9688ccbc655836524bd84da339f79deb6 (diff) |
cabin (24jun13)
git-svn-id: svn://tug.org/texlive/trunk@30908 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cabin')
9 files changed, 343 insertions, 125 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd index ccb05686833..cb432b6d749 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd @@ -11,30 +11,46 @@ \DeclareFontFamily{LY1}{Cabin-TLF}{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-sc-ly1 +\else + Cabin-Bold-tlf-sc-ly1 +\fi }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{b}{n}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-ly1 +\else + Cabin-Bold-tlf-ly1 +\fi }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{b}{it}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-ly1 +\else + Cabin-BoldItalic-tlf-ly1 +\fi }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-sc-ly1 +\else + Cabin-BoldItalic-tlf-sc-ly1 +\fi }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{ <-> ssub * Cabin-TLF/b/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ - <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ly1 + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{n}{ @@ -77,23 +93,39 @@ \DeclareFontShape{LY1}{Cabin-TLF}{mb}{scsl}{ <-> ssub * Cabin-TLF/mb/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-sc-ly1 +\else + Cabin-Regular-tlf-sc-ly1 +\fi }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-ly1 +\else + Cabin-Regular-tlf-ly1 +\fi }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-ly1 +\else + Cabin-Italic-tlf-ly1 +\fi }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ <-> ssub * Cabin-TLF/m/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-sc-ly1 +\else + Cabin-Italic-tlf-sc-ly1 +\fi }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd index a11bf7cc5d8..43e3069e4d8 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd @@ -11,23 +11,39 @@ \DeclareFontFamily{LY1}{CabinCondensed-TLF}{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-sc-ly1 +\else + CabinCondensed-Bold-tlf-sc-ly1 +\fi }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{n}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-ly1 +\else + CabinCondensed-Bold-tlf-ly1 +\fi }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{it}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-ly1 +\else + CabinCondensed-BoldItalic-tlf-ly1 +\fi }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-sc-ly1 +\else + CabinCondensed-BoldItalic-tlf-sc-ly1 +\fi }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scsl}{ @@ -77,23 +93,39 @@ \DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scsl}{ <-> ssub * CabinCondensed-TLF/mb/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-sc-ly1 +\else + CabinCondensed-Regular-tlf-sc-ly1 +\fi }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{n}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-ly1 +\else + CabinCondensed-Regular-tlf-ly1 +\fi }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-ly1 +\else + CabinCondensed-RegularItalic-tlf-ly1 +\fi }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{ <-> ssub * CabinCondensed-TLF/m/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-sc-ly1 +\else + CabinCondensed-RegularItalic-tlf-sc-ly1 +\fi }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd index 17a206b343b..f07ffc2adfc 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd @@ -11,23 +11,39 @@ \DeclareFontFamily{OT1}{Cabin-TLF}{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-sc-ot1 +\else + Cabin-Bold-tlf-sc-ot1 +\fi }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-ot1 +\else + Cabin-Bold-tlf-ot1 +\fi }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-ot1 +\else + Cabin-BoldItalic-tlf-ot1 +\fi }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-sc-ot1 +\else + Cabin-BoldItalic-tlf-sc-ot1 +\fi }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{ @@ -77,23 +93,39 @@ \DeclareFontShape{OT1}{Cabin-TLF}{mb}{scsl}{ <-> ssub * Cabin-TLF/mb/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-sc-ot1 +\else + Cabin-Regular-tlf-sc-ot1 +\fi }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-ot1 +\else + Cabin-Regular-tlf-ot1 +\fi }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-ot1 +\else + Cabin-Italic-tlf-ot1 +\fi }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ <-> ssub * Cabin-TLF/m/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-sc-ot1 +\else + Cabin-Italic-tlf-sc-ot1 +\fi }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd index 64301a8bc42..163ad8ef71f 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd @@ -11,23 +11,39 @@ \DeclareFontFamily{OT1}{CabinCondensed-TLF}{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-sc-ot1 +\else + CabinCondensed-Bold-tlf-sc-ot1 +\fi }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{n}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-ot1 +\else + CabinCondensed-Bold-tlf-ot1 +\fi }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{it}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-ot1 +\else + CabinCondensed-BoldItalic-tlf-ot1 +\fi }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-sc-ot1 +\else + CabinCondensed-BoldItalic-tlf-sc-ot1 +\fi }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scsl}{ @@ -77,23 +93,39 @@ \DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scsl}{ <-> ssub * CabinCondensed-TLF/mb/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-sc-ot1 +\else + CabinCondensed-Regular-tlf-sc-ot1 +\fi }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{n}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-ot1 +\else + CabinCondensed-Regular-tlf-ot1 +\fi }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-ot1 +\else + CabinCondensed-RegularItalic-tlf-ot1 +\fi }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{ <-> ssub * CabinCondensed-TLF/m/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-sc-ot1 +\else + CabinCondensed-RegularItalic-tlf-sc-ot1 +\fi }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd index 6b2af0a1205..daf79a719de 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd @@ -11,23 +11,39 @@ \DeclareFontFamily{T1}{Cabin-TLF}{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-sc-t1 +\else + Cabin-Bold-tlf-sc-t1 +\fi }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{b}{n}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-t1 +\else + Cabin-Bold-tlf-t1 +\fi }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{b}{it}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-t1 +\else + Cabin-BoldItalic-tlf-t1 +\fi }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-sc-t1 +\else + Cabin-BoldItalic-tlf-sc-t1 +\fi }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{ @@ -55,6 +71,7 @@ \DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{ <-> ssub * Cabin-TLF/sb/scit }{} + \DeclareFontShape{T1}{Cabin-TLF}{mb}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-t1 }{} @@ -77,23 +94,40 @@ \DeclareFontShape{T1}{Cabin-TLF}{mb}{scsl}{ <-> ssub * Cabin-TLF/mb/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-t1 + +\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-sc-t1 +\else + Cabin-Regular-tlf-sc-t1 +\fi }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-t1 +\else + Cabin-Regular-tlf-t1 +\fi }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-t1 +\else + Cabin-Italic-tlf-t1 +\fi }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ <-> ssub * Cabin-TLF/m/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-t1 +\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-sc-t1 +\else + Cabin-Italic-tlf-sc-t1 +\fi }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd index cd2bf5c5ddb..99a014ab5a5 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd @@ -11,23 +11,39 @@ \DeclareFontFamily{T1}{CabinCondensed-TLF}{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-sc-t1 +\else + CabinCondensed-Bold-tlf-sc-t1 +\fi }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{n}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-t1 +\else + CabinCondensed-Bold-tlf-t1 +\fi }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{it}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-t1 +\else + CabinCondensed-BoldItalic-tlf-t1 +\fi }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-sc-t1 +\else + CabinCondensed-BoldItalic-tlf-sc-t1 +\fi }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scsl}{ @@ -77,23 +93,39 @@ \DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scsl}{ <-> ssub * CabinCondensed-TLF/mb/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-sc-t1 +\else + CabinCondensed-Regular-tlf-sc-t1 +\fi }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{n}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-t1 +\else + CabinCondensed-Regular-tlf-t1 +\fi }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-t1 +\else + CabinCondensed-RegularItalic-tlf-t1 +\fi }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{ <-> ssub * CabinCondensed-TLF/m/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scit}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-sc-t1 +\else + CabinCondensed-RegularItalic-tlf-sc-t1 +\fi }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scsl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd index a6f4ff33673..292b638226c 100644 --- a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd @@ -11,12 +11,20 @@ \DeclareFontFamily{TS1}{Cabin-TLF}{} -\DeclareFontShape{TS1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ts1 +\DeclareFontShape{TS1}{Cabin-TLF}{b}{n}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBold-tlf-ts1 +\else + Cabin-Bold-tlf-ts1 +\fi }{} -\DeclareFontShape{TS1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Cabin-TLF}{b}{it}{ <-> \Cabin@@scale +\ifcabin@semibold + Cabin-SemiBoldItalic-tlf-ts1 +\else + Cabin-BoldItalic-tlf-ts1 +\fi }{} \DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{ @@ -44,12 +52,20 @@ \DeclareFontShape{TS1}{Cabin-TLF}{mb}{sl}{ <-> ssub * Cabin-TLF/mb/it }{} -\DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ts1 +\DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-Medium-tlf-ts1 +\else + Cabin-Regular-tlf-ts1 +\fi }{} -\DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ts1 +\DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ <-> \Cabin@@scale +\ifcabin@medium + Cabin-MediumItalic-tlf-ts1 +\else + Cabin-Italic-tlf-ts1 +\fi }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd index af834b21689..bbc878be819 100644 --- a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd @@ -11,12 +11,20 @@ \DeclareFontFamily{TS1}{CabinCondensed-TLF}{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ts1 +\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{n}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBold-tlf-ts1 +\else + CabinCondensed-Bold-tlf-ts1 +\fi }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{it}{ <-> \CabinCondensed@@scale +\ifcabin@semibold + CabinCondensed-SemiBoldItalic-tlf-ts1 +\else + CabinCondensed-BoldItalic-tlf-ts1 +\fi }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{sl}{ @@ -44,12 +52,20 @@ \DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{sl}{ <-> ssub * CabinCondensed-TLF/mb/it }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1 +\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{n}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-Medium-tlf-ts1 +\else + CabinCondensed-Regular-tlf-ts1 +\fi }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ts1 +\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{ <-> \CabinCondensed@@scale +\ifcabin@medium + CabinCondensed-MediumItalic-tlf-ts1 +\else + CabinCondensed-RegularItalic-tlf-ts1 +\fi }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{sl}{ diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty index da09666df22..a4df565ff83 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} - [2012/11/13 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] + [2013/06/22 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -50,16 +50,8 @@ \else % type1 - \ifcabin@semibold - \renewcommand*{\bfdefault}{sb} - \else - \renewcommand*{\bfdefault}{b} - \fi - \ifcabin@medium - \renewcommand*{\mddefault}{mb} - \else - \renewcommand*{\mddefault}{m} - \fi +% now using \ifcabin@semibold and \ifcabin@medium in .fd files + \fi \ifcabin@otf |