From 4fa4ff22732b71ed4356295cbbe0672e29dcea43 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 May 2018 23:27:30 +0000 Subject: cabin (19may18) git-svn-id: svn://tug.org/texlive/trunk@47770 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd | 74 ++++++++++++ Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd | 124 ++++++++++++++++---- .../tex/latex/cabin/LY1CabinCondensed-Sup.fd | 74 ++++++++++++ .../tex/latex/cabin/LY1CabinCondensed-TLF.fd | 128 +++++++++++++++++---- Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd | 74 ++++++++++++ Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd | 124 ++++++++++++++++---- .../tex/latex/cabin/OT1CabinCondensed-Sup.fd | 74 ++++++++++++ .../tex/latex/cabin/OT1CabinCondensed-TLF.fd | 128 +++++++++++++++++---- Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd | 74 ++++++++++++ Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd | 124 ++++++++++++++++---- .../tex/latex/cabin/T1CabinCondensed-Sup.fd | 74 ++++++++++++ .../tex/latex/cabin/T1CabinCondensed-TLF.fd | 128 +++++++++++++++++---- Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd | 29 +++-- .../tex/latex/cabin/TS1CabinCondensed-TLF.fd | 31 +++-- Master/texmf-dist/tex/latex/cabin/cabin.sty | 13 ++- 15 files changed, 1122 insertions(+), 151 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd create mode 100644 Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd (limited to 'Master/texmf-dist/tex/latex/cabin') diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd new file mode 100644 index 00000000000..ba2978bb4ed --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{LY1Cabin-Sup.fd} + [2018/05/18 (autoinst) Font definitions for LY1/Cabin-Sup.] + +\expandafter\ifx\csname Cabin@scale\endcsname\relax + \let\Cabin@@scale\@empty +\else + \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{Cabin-Sup}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{n}{ + <-> \Cabin@@scale Cabin-SemiBold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{it}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/sb/it +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{mb}{n}{ + <-> \Cabin@@scale Cabin-Medium-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{mb}{it}{ + <-> \Cabin@@scale Cabin-MediumItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{mb}{sl}{ + <-> ssub * Cabin-Sup/mb/it +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/m/it +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{bx}{n}{ + <-> ssub * Cabin-Sup/b/n +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{bx}{it}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd index ccb05686833..4e83827c4de 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{LY1Cabin-TLF.fd} - [2012/11/17 (autoinst) Font definitions for LY1/Cabin-TLF.] + [2018/05/18 (autoinst) Font definitions for LY1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{LY1}{Cabin-TLF}{} +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale Cabin-Bold-tlf-sc-ly1 }{} @@ -23,16 +27,30 @@ <-> \Cabin@@scale Cabin-BoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/b/it }{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tl}{ + <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ly1 }{} @@ -45,16 +63,30 @@ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlit}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit + <-> ssub * Cabin-TLF/sb/scit }{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/sb/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/sb/tlit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tl}{ + <-> \Cabin@@scale Cabin-Medium-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{Cabin-TLF}{mb}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-ly1 }{} @@ -67,16 +99,30 @@ <-> \Cabin@@scale Cabin-MediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tlit}{ + <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{Cabin-TLF}{mb}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit + <-> ssub * Cabin-TLF/mb/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{mb}{sl}{ + <-> ssub * Cabin-TLF/mb/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tlsl}{ + <-> ssub * Cabin-TLF/mb/tlit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale Cabin-Regular-tlf-sc-ly1 }{} @@ -89,22 +135,60 @@ <-> \Cabin@@scale Cabin-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it +\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale Cabin-Italic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit + <-> ssub * Cabin-TLF/m/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/m/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/m/tlit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{n}{ + <-> ssub * Cabin-TLF/b/n +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{it}{ + <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{} +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scit}{ + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd new file mode 100644 index 00000000000..d6cafd0c1c8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{LY1CabinCondensed-Sup.fd} + [2018/05/18 (autoinst) Font definitions for LY1/CabinCondensed-Sup.] + +\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax + \let\CabinCondensed@@scale\@empty +\else + \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{CabinCondensed-Sup}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/sb/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{sl}{ + <-> ssub * CabinCondensed-Sup/mb/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/m/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{n}{ + <-> ssub * CabinCondensed-Sup/b/n +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{it}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd index a11bf7cc5d8..830a4419f05 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{LY1CabinCondensed-TLF.fd} - [2012/11/17 (autoinst) Font definitions for LY1/CabinCondensed-TLF.] + [2018/05/18 (autoinst) Font definitions for LY1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{LY1}{CabinCondensed-TLF}{} +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ly1 }{} @@ -23,16 +27,30 @@ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/b/it }{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ly1 }{} @@ -45,16 +63,30 @@ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit + <-> ssub * CabinCondensed-TLF/sb/scit }{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/sb/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/sb/tlit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ly1 +}{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ly1 }{} @@ -67,16 +99,30 @@ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit + <-> ssub * CabinCondensed-TLF/mb/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sl}{ + <-> ssub * CabinCondensed-TLF/mb/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/mb/tlit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1 }{} @@ -86,25 +132,63 @@ }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ly1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ly1 }{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ly1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit + <-> ssub * CabinCondensed-TLF/m/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/m/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/m/tlit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{n}{ + <-> ssub * CabinCondensed-TLF/b/n +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{it}{ + <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{} +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sl}{ + <-> ssub * CabinCondensed-TLF/b/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlsl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scit}{ + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd new file mode 100644 index 00000000000..ebbfaa29409 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{OT1Cabin-Sup.fd} + [2018/05/18 (autoinst) Font definitions for OT1/Cabin-Sup.] + +\expandafter\ifx\csname Cabin@scale\endcsname\relax + \let\Cabin@@scale\@empty +\else + \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{Cabin-Sup}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{n}{ + <-> \Cabin@@scale Cabin-SemiBold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{it}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/sb/it +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{mb}{n}{ + <-> \Cabin@@scale Cabin-Medium-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{mb}{it}{ + <-> \Cabin@@scale Cabin-MediumItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{mb}{sl}{ + <-> ssub * Cabin-Sup/mb/it +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/m/it +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{bx}{n}{ + <-> ssub * Cabin-Sup/b/n +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{bx}{it}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd index 17a206b343b..8ba71ef0714 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{OT1Cabin-TLF.fd} - [2012/11/17 (autoinst) Font definitions for OT1/Cabin-TLF.] + [2018/05/18 (autoinst) Font definitions for OT1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{OT1}{Cabin-TLF}{} +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale Cabin-Bold-tlf-sc-ot1 }{} @@ -23,16 +27,30 @@ <-> \Cabin@@scale Cabin-BoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/b/it }{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tl}{ + <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ot1 }{} @@ -45,16 +63,30 @@ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlit}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit + <-> ssub * Cabin-TLF/sb/scit }{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/sb/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/sb/tlit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tl}{ + <-> \Cabin@@scale Cabin-Medium-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{Cabin-TLF}{mb}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-ot1 }{} @@ -67,16 +99,30 @@ <-> \Cabin@@scale Cabin-MediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tlit}{ + <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{Cabin-TLF}{mb}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit + <-> ssub * Cabin-TLF/mb/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{mb}{sl}{ + <-> ssub * Cabin-TLF/mb/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tlsl}{ + <-> ssub * Cabin-TLF/mb/tlit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale Cabin-Regular-tlf-sc-ot1 }{} @@ -89,22 +135,60 @@ <-> \Cabin@@scale Cabin-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it +\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale Cabin-Italic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit + <-> ssub * Cabin-TLF/m/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/m/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/m/tlit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{ + <-> ssub * Cabin-TLF/b/n +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{it}{ + <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{} +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scit}{ + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd new file mode 100644 index 00000000000..1430710a335 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{OT1CabinCondensed-Sup.fd} + [2018/05/18 (autoinst) Font definitions for OT1/CabinCondensed-Sup.] + +\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax + \let\CabinCondensed@@scale\@empty +\else + \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{CabinCondensed-Sup}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/sb/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{sl}{ + <-> ssub * CabinCondensed-Sup/mb/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/m/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{n}{ + <-> ssub * CabinCondensed-Sup/b/n +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{it}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd index 64301a8bc42..4de57208c30 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{OT1CabinCondensed-TLF.fd} - [2012/11/17 (autoinst) Font definitions for OT1/CabinCondensed-TLF.] + [2018/05/18 (autoinst) Font definitions for OT1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{OT1}{CabinCondensed-TLF}{} +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ot1 }{} @@ -23,16 +27,30 @@ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/b/it }{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ot1 }{} @@ -45,16 +63,30 @@ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit + <-> ssub * CabinCondensed-TLF/sb/scit }{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/sb/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/sb/tlit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ot1 +}{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ot1 }{} @@ -67,16 +99,30 @@ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit + <-> ssub * CabinCondensed-TLF/mb/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sl}{ + <-> ssub * CabinCondensed-TLF/mb/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/mb/tlit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1 }{} @@ -86,25 +132,63 @@ }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ot1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ot1 }{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ot1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ot1 }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit + <-> ssub * CabinCondensed-TLF/m/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/m/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/m/tlit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{n}{ + <-> ssub * CabinCondensed-TLF/b/n +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{it}{ + <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{} +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sl}{ + <-> ssub * CabinCondensed-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlsl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scit}{ + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd new file mode 100644 index 00000000000..824a0f0dda7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{T1Cabin-Sup.fd} + [2018/05/18 (autoinst) Font definitions for T1/Cabin-Sup.] + +\expandafter\ifx\csname Cabin@scale\endcsname\relax + \let\Cabin@@scale\@empty +\else + \edef\Cabin@@scale{s*[\csname Cabin@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{Cabin-Sup}{} + +\DeclareFontShape{T1}{Cabin-Sup}{b}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{b}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{sb}{n}{ + <-> \Cabin@@scale Cabin-SemiBold-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{sb}{it}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/sb/it +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{mb}{n}{ + <-> \Cabin@@scale Cabin-Medium-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{mb}{it}{ + <-> \Cabin@@scale Cabin-MediumItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{mb}{sl}{ + <-> ssub * Cabin-Sup/mb/it +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{m}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{m}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/m/it +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{bx}{n}{ + <-> ssub * Cabin-Sup/b/n +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{bx}{it}{ + <-> ssub * Cabin-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd index 6b2af0a1205..834fc21a319 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{T1Cabin-TLF.fd} - [2012/11/17 (autoinst) Font definitions for T1/Cabin-TLF.] + [2018/05/18 (autoinst) Font definitions for T1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{T1}{Cabin-TLF}{} +\DeclareFontShape{T1}{Cabin-TLF}{b}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ <-> \Cabin@@scale Cabin-Bold-tlf-sc-t1 }{} @@ -23,16 +27,30 @@ <-> \Cabin@@scale Cabin-BoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{T1}{Cabin-TLF}{b}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/b/it }{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tl}{ + <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{Cabin-TLF}{sb}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-t1 }{} @@ -45,16 +63,30 @@ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlit}{ + <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit + <-> ssub * Cabin-TLF/sb/scit }{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/sb/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/sb/tlit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{mb}{tl}{ + <-> \Cabin@@scale Cabin-Medium-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{Cabin-TLF}{mb}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-t1 }{} @@ -67,16 +99,30 @@ <-> \Cabin@@scale Cabin-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{T1}{Cabin-TLF}{mb}{tlit}{ + <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{Cabin-TLF}{mb}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit + <-> ssub * Cabin-TLF/mb/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{mb}{sl}{ + <-> ssub * Cabin-TLF/mb/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{mb}{tlsl}{ + <-> ssub * Cabin-TLF/mb/tlit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-t1 }{} + \DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ <-> \Cabin@@scale Cabin-Regular-tlf-sc-t1 }{} @@ -89,22 +135,60 @@ <-> \Cabin@@scale Cabin-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it +\DeclareFontShape{T1}{Cabin-TLF}{m}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ <-> \Cabin@@scale Cabin-Italic-tlf-sc-t1 }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit + <-> ssub * Cabin-TLF/m/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/m/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/m/tlit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{n}{ + <-> ssub * Cabin-TLF/b/n +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{it}{ + <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{} +\DeclareFontShape{T1}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{tlsl}{ + <-> ssub * Cabin-TLF/b/tlsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{scit}{ + <-> ssub * Cabin-TLF/b/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd new file mode 100644 index 00000000000..ebe4016f937 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2018/05/18 +%% +\ProvidesFile{T1CabinCondensed-Sup.fd} + [2018/05/18 (autoinst) Font definitions for T1/CabinCondensed-Sup.] + +\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax + \let\CabinCondensed@@scale\@empty +\else + \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{CabinCondensed-Sup}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/sb/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{sl}{ + <-> ssub * CabinCondensed-Sup/mb/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/m/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{n}{ + <-> ssub * CabinCondensed-Sup/b/n +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{it}{ + <-> ssub * CabinCondensed-Sup/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd index cd2bf5c5ddb..0f61fe168c2 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{T1CabinCondensed-TLF.fd} - [2012/11/17 (autoinst) Font definitions for T1/CabinCondensed-TLF.] + [2018/05/18 (autoinst) Font definitions for T1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,6 +11,10 @@ \DeclareFontFamily{T1}{CabinCondensed-TLF}{} +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-t1 }{} @@ -23,16 +27,30 @@ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/b/it }{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-t1 }{} @@ -45,16 +63,30 @@ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit + <-> ssub * CabinCondensed-TLF/sb/scit }{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/sb/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/sb/tlit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-t1 +}{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-t1 }{} @@ -67,16 +99,30 @@ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-t1 }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit + <-> ssub * CabinCondensed-TLF/mb/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sl}{ + <-> ssub * CabinCondensed-TLF/mb/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/mb/tlit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-t1 }{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1 }{} @@ -86,25 +132,63 @@ }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-t1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-t1 }{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-t1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-t1 }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit + <-> ssub * CabinCondensed-TLF/m/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/m/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/m/tlit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{n}{ + <-> ssub * CabinCondensed-TLF/b/n +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{it}{ + <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{} +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sl}{ + <-> ssub * CabinCondensed-TLF/b/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tlsl}{ + <-> ssub * CabinCondensed-TLF/b/tlsl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scit}{ + <-> ssub * CabinCondensed-TLF/b/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd index a6f4ff33673..53a7cc4fc7b 100644 --- a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{TS1Cabin-TLF.fd} - [2012/11/17 (autoinst) Font definitions for TS1/Cabin-TLF.] + [2018/05/18 (autoinst) Font definitions for TS1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -20,8 +20,9 @@ }{} \DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it + <-> ssub * Cabin-TLF/b/it }{} + \DeclareFontShape{TS1}{Cabin-TLF}{sb}{n}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-ts1 }{} @@ -31,8 +32,9 @@ }{} \DeclareFontShape{TS1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it + <-> ssub * Cabin-TLF/sb/it }{} + \DeclareFontShape{TS1}{Cabin-TLF}{mb}{n}{ <-> \Cabin@@scale Cabin-Medium-tlf-ts1 }{} @@ -42,8 +44,9 @@ }{} \DeclareFontShape{TS1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it + <-> ssub * Cabin-TLF/mb/it }{} + \DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ <-> \Cabin@@scale Cabin-Regular-tlf-ts1 }{} @@ -53,11 +56,19 @@ }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it + <-> ssub * Cabin-TLF/m/it +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{bx}{n}{ + <-> ssub * Cabin-TLF/b/n }{} -\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{} -\DeclareFontShape{TS1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} -\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{} +\DeclareFontShape{TS1}{Cabin-TLF}{bx}{it}{ + <-> ssub * Cabin-TLF/b/it +}{} \endinput diff --git a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd index af834b21689..75154f820b0 100644 --- a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd +++ b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2012/11/17 +%% Generated by autoinst on 2018/05/18 %% \ProvidesFile{TS1CabinCondensed-TLF.fd} - [2012/11/17 (autoinst) Font definitions for TS1/CabinCondensed-TLF.] + [2018/05/18 (autoinst) Font definitions for TS1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -20,8 +20,9 @@ }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it + <-> ssub * CabinCondensed-TLF/b/it }{} + \DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ts1 }{} @@ -31,8 +32,9 @@ }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it + <-> ssub * CabinCondensed-TLF/sb/it }{} + \DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ts1 }{} @@ -42,22 +44,31 @@ }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it + <-> ssub * CabinCondensed-TLF/mb/it }{} + \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1 }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ts1 + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ts1 }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it + <-> ssub * CabinCondensed-TLF/m/it +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{sl}{ + <-> ssub * CabinCondensed-TLF/b/sl +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{n}{ + <-> ssub * CabinCondensed-TLF/b/n }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{} +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{it}{ + <-> ssub * CabinCondensed-TLF/b/it +}{} \endinput 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} -- cgit v1.2.3