From 21cb178c7f135b21a38eee670cfa15bc5669cc13 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Apr 2019 20:51:45 +0000 Subject: cabin (4apr19) git-svn-id: svn://tug.org/texlive/trunk@50751 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cabin/Cabin.sty | 55 +++++ .../texmf-dist/tex/latex/cabin/CabinCondensed.sty | 55 +++++ Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd | 104 ++++++-- Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd | 266 +++++++++++++++------ .../tex/latex/cabin/LY1CabinCondensed-Sup.fd | 104 ++++++-- .../tex/latex/cabin/LY1CabinCondensed-TLF.fd | 266 +++++++++++++++------ Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd | 104 ++++++-- Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd | 266 +++++++++++++++------ .../tex/latex/cabin/OT1CabinCondensed-Sup.fd | 104 ++++++-- .../tex/latex/cabin/OT1CabinCondensed-TLF.fd | 266 +++++++++++++++------ Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd | 104 ++++++-- Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd | 266 +++++++++++++++------ .../tex/latex/cabin/T1CabinCondensed-Sup.fd | 104 ++++++-- .../tex/latex/cabin/T1CabinCondensed-TLF.fd | 266 +++++++++++++++------ Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd | 104 ++++++-- .../tex/latex/cabin/TS1CabinCondensed-TLF.fd | 104 ++++++-- Master/texmf-dist/tex/latex/cabin/cabin.sty | 10 +- 17 files changed, 1965 insertions(+), 583 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/cabin/Cabin.sty create mode 100644 Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/cabin/Cabin.sty b/Master/texmf-dist/tex/latex/cabin/Cabin.sty new file mode 100644 index 00000000000..9f44a0564ce --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/Cabin.sty @@ -0,0 +1,55 @@ +%% Generated by autoinst on 2019/04/04 +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{Cabin} + [2019/04/04 (autoinst) Style file for Cabin.] + +\RequirePackage[T1,LY1]{fontenc} +\RequirePackage{textcomp} +\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} +\IfFileExists{fontaxes.sty}{ + \RequirePackage{fontaxes} + \providecommand{\tldefault}{tl} + \DeclareRobustCommand\tlshape{\not@math@alphabet\tlshape\relax + \fontsecondaryshape\tldefault\selectfont} + \DeclareTextFontCommand{\texttl}{\tlshape} + \let\texttitling\texttl + \fa@naming@exception{shape}{{n}{tl}}{tl} + \fa@naming@exception{shape}{{it}{tl}}{tlit} + \fa@naming@exception{shape}{{sl}{tl}}{tlsl} + + \fa@naming@exception{figures}{{superior}{proportional}}{Sup} + \fa@naming@exception{figures}{{superior}{tabular}}{Sup} + \def\sufigures{\@nomath\sufigures + \fontfigurestyle{superior}\selectfont} + \DeclareTextFontCommand{\textsu}{\sufigures} + \let\textsuperior\textsu + +}{} + +\IfFileExists{xkeyval.sty}{ + \newcommand*{\Cabin@scale}{1} + \RequirePackage{xkeyval} + \DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{##1}} + \DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{##1}} +}{ + \let\DeclareOptionX\DeclareOption + \let\ExecuteOptionsX\ExecuteOptions + \let\ProcessOptionsX\ProcessOptions +} + +\DeclareOptionX{lining}{\edef\Cabin@figurestyle{LF}} +\DeclareOptionX{tabular}{\edef\Cabin@figurealign{T}} +\DeclareOptionX{semibold}{\edef\bfseries@rm{semibold}} +\DeclareOptionX{bold}{\edef\bfseries@rm{bold}} +\DeclareOptionX{medium}{\edef\mdseries@rm{medium}} +\DeclareOptionX{regular}{\edef\mdseries@rm{regular}} +\ExecuteOptionsX{lining,tabular,bold,regular} +\ProcessOptionsX\relax + +\renewcommand* + {\rmdefault} + {Cabin-\Cabin@figurealign\Cabin@figurestyle} +\renewcommand*{\familydefault}{\rmdefault} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty b/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty new file mode 100644 index 00000000000..01d9de3ebc0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty @@ -0,0 +1,55 @@ +%% Generated by autoinst on 2019/04/04 +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{CabinCondensed} + [2019/04/04 (autoinst) Style file for CabinCondensed.] + +\RequirePackage[T1,LY1]{fontenc} +\RequirePackage{textcomp} +\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} +\IfFileExists{fontaxes.sty}{ + \RequirePackage{fontaxes} + \providecommand{\tldefault}{tl} + \DeclareRobustCommand\tlshape{\not@math@alphabet\tlshape\relax + \fontsecondaryshape\tldefault\selectfont} + \DeclareTextFontCommand{\texttl}{\tlshape} + \let\texttitling\texttl + \fa@naming@exception{shape}{{n}{tl}}{tl} + \fa@naming@exception{shape}{{it}{tl}}{tlit} + \fa@naming@exception{shape}{{sl}{tl}}{tlsl} + + \fa@naming@exception{figures}{{superior}{proportional}}{Sup} + \fa@naming@exception{figures}{{superior}{tabular}}{Sup} + \def\sufigures{\@nomath\sufigures + \fontfigurestyle{superior}\selectfont} + \DeclareTextFontCommand{\textsu}{\sufigures} + \let\textsuperior\textsu + +}{} + +\IfFileExists{xkeyval.sty}{ + \newcommand*{\CabinCondensed@scale}{1} + \RequirePackage{xkeyval} + \DeclareOptionX{scale}{\renewcommand*{\CabinCondensed@scale}{##1}} + \DeclareOptionX{scaled}{\renewcommand*{\CabinCondensed@scale}{##1}} +}{ + \let\DeclareOptionX\DeclareOption + \let\ExecuteOptionsX\ExecuteOptions + \let\ProcessOptionsX\ProcessOptions +} + +\DeclareOptionX{lining}{\edef\CabinCondensed@figurestyle{LF}} +\DeclareOptionX{tabular}{\edef\CabinCondensed@figurealign{T}} +\DeclareOptionX{semibold}{\edef\bfseries@rm{semibold}} +\DeclareOptionX{bold}{\edef\bfseries@rm{bold}} +\DeclareOptionX{medium}{\edef\mdseries@rm{medium}} +\DeclareOptionX{regular}{\edef\mdseries@rm{regular}} +\ExecuteOptionsX{lining,tabular,bold,regular} +\ProcessOptionsX\relax + +\renewcommand* + {\rmdefault} + {CabinCondensed-\CabinCondensed@figurealign\CabinCondensed@figurestyle} +\renewcommand*{\familydefault}{\rmdefault} + +\endinput diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd index ba2978bb4ed..15c0f1c3963 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{LY1Cabin-Sup.fd} - [2018/05/18 (autoinst) Font definitions for LY1/Cabin-Sup.] + [2019/04/04 (autoinst) Font definitions for LY1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{LY1}{Cabin-Sup}{} -\DeclareFontShape{LY1}{Cabin-Sup}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-sup-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{Cabin-Sup}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{Cabin-Sup}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/b/it +\DeclareFontShape{LY1}{Cabin-Sup}{regular}{sl}{ + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{LY1}{Cabin-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Cabin-Sup}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{sb}{it}{ +\DeclareFontShape{LY1}{Cabin-Sup}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/sb/it +\DeclareFontShape{LY1}{Cabin-Sup}{semibold}{sl}{ + <-> ssub * Cabin-Sup/semibold/it }{} -\DeclareFontShape{LY1}{Cabin-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{LY1}{Cabin-Sup}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{bold}{sl}{ + <-> ssub * Cabin-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{Cabin-Sup}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{mb}{it}{ +\DeclareFontShape{LY1}{Cabin-Sup}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Cabin-Sup}{mb}{sl}{ - <-> ssub * Cabin-Sup/mb/it +\DeclareFontShape{LY1}{Cabin-Sup}{medium}{sl}{ + <-> ssub * Cabin-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/regular/sl }{} \DeclareFontShape{LY1}{Cabin-Sup}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-sup-ly1 + <-> ssub * Cabin-Sup/regular/n }{} \DeclareFontShape{LY1}{Cabin-Sup}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-sup-ly1 + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/semibold/sl }{} -\DeclareFontShape{LY1}{Cabin-Sup}{bx}{sl}{ - <-> ssub * Cabin-Sup/b/sl +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{n}{ + <-> ssub * Cabin-Sup/semibold/n +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{sb}{it}{ + <-> ssub * Cabin-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/bold/sl +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{n}{ + <-> ssub * Cabin-Sup/bold/n +}{} + +\DeclareFontShape{LY1}{Cabin-Sup}{b}{it}{ + <-> ssub * Cabin-Sup/bold/it }{} \DeclareFontShape{LY1}{Cabin-Sup}{bx}{n}{ <-> ssub * Cabin-Sup/b/n }{} +\DeclareFontShape{LY1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + \DeclareFontShape{LY1}{Cabin-Sup}{bx}{it}{ <-> ssub * Cabin-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd index 4e83827c4de..5f24b11e3ff 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{LY1Cabin-TLF.fd} - [2018/05/18 (autoinst) Font definitions for LY1/Cabin-TLF.] + [2019/04/04 (autoinst) Font definitions for LY1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{LY1}{Cabin-TLF}{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{tl}{ - <-> \Cabin@@scale Cabin-Bold-tlf-titling-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{sc}{ + <-> \Cabin@@scale Cabin-Regular-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{scit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{scsl}{ + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{sl}{ + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlsl}{ - <-> ssub * Cabin-TLF/b/tlit +\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{tl}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{n}{ +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{it}{ +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{tlit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{sl}{ + <-> ssub * Cabin-TLF/semibold/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlsl}{ - <-> ssub * Cabin-TLF/sb/tlit +\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{sc}{ + <-> \Cabin@@scale Cabin-Bold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{scit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{scsl}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{sl}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bold}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tl}{ <-> \Cabin@@scale Cabin-Medium-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{sc}{ +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{n}{ +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{it}{ +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tlit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tlit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{scit}{ +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{scsl}{ + <-> ssub * Cabin-TLF/medium/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{sl}{ + <-> ssub * Cabin-TLF/medium/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{mb}{tlsl}{ - <-> ssub * Cabin-TLF/mb/tlit +\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tlsl}{ + <-> ssub * Cabin-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/regular/scsl }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{tl}{ - <-> \Cabin@@scale Cabin-Regular-tlf-titling-ly1 + <-> ssub * Cabin-TLF/regular/tl }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-ly1 + <-> ssub * Cabin-TLF/regular/sc }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ly1 + <-> ssub * Cabin-TLF/regular/n }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ly1 + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-titling-ly1 +\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/regular/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlsl }{} \DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-ly1 + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit +\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlit}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scsl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlsl}{ - <-> ssub * Cabin-TLF/m/tlit +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tl}{ + <-> ssub * Cabin-TLF/semibold/tl }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scsl}{ - <-> ssub * Cabin-TLF/b/scsl +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{ + <-> ssub * Cabin-TLF/semibold/sc }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tl}{ - <-> ssub * Cabin-TLF/b/tl +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{n}{ + <-> ssub * Cabin-TLF/semibold/n }{} -\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sc}{ - <-> ssub * Cabin-TLF/b/sc +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{it}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/semibold/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{ + <-> ssub * Cabin-TLF/semibold/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlit}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{ + <-> ssub * Cabin-TLF/bold/scsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tl}{ + <-> ssub * Cabin-TLF/bold/tl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{ + <-> ssub * Cabin-TLF/bold/sc +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{n}{ + <-> ssub * Cabin-TLF/bold/n +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{it}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/bold/sl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlsl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{scit}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{b}{tlit}{ + <-> ssub * Cabin-TLF/bold/tlit }{} \DeclareFontShape{LY1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + \DeclareFontShape{LY1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * Cabin-TLF/b/sl }{} +\DeclareFontShape{LY1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + \DeclareFontShape{LY1}{Cabin-TLF}{bx}{tlsl}{ <-> ssub * Cabin-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 index d6cafd0c1c8..9887768c726 100644 --- a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{LY1CabinCondensed-Sup.fd} - [2018/05/18 (autoinst) Font definitions for LY1/CabinCondensed-Sup.] + [2019/04/04 (autoinst) Font definitions for LY1/CabinCondensed-Sup.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{LY1}{CabinCondensed-Sup}{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{sl}{ - <-> ssub * CabinCondensed-Sup/b/it +\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{it}{ +\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{sl}{ - <-> ssub * CabinCondensed-Sup/sb/it +\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/it }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bold}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{it}{ +\DeclareFontShape{LY1}{CabinCondensed-Sup}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{mb}{sl}{ - <-> ssub * CabinCondensed-Sup/mb/it +\DeclareFontShape{LY1}{CabinCondensed-Sup}{medium}{sl}{ + <-> ssub * CabinCondensed-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/sl }{} \DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ly1 + <-> ssub * CabinCondensed-Sup/regular/n }{} \DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ly1 + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{sl}{ - <-> ssub * CabinCondensed-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/sl }{} -\DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{sl}{ - <-> ssub * CabinCondensed-Sup/b/sl +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{n}{ + <-> ssub * CabinCondensed-Sup/semibold/n +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{it}{ + <-> ssub * CabinCondensed-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{n}{ + <-> ssub * CabinCondensed-Sup/bold/n +}{} + +\DeclareFontShape{LY1}{CabinCondensed-Sup}{b}{it}{ + <-> ssub * CabinCondensed-Sup/bold/it }{} \DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{n}{ <-> ssub * CabinCondensed-Sup/b/n }{} +\DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + \DeclareFontShape{LY1}{CabinCondensed-Sup}{bx}{it}{ <-> ssub * CabinCondensed-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd index 830a4419f05..2dcd1a69c18 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{LY1CabinCondensed-TLF.fd} - [2018/05/18 (autoinst) Font definitions for LY1/CabinCondensed-TLF.] + [2019/04/04 (autoinst) Font definitions for LY1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{LY1}{CabinCondensed-TLF}{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ly1 + +% ---- regular ---- + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlsl}{ - <-> ssub * CabinCondensed-TLF/b/tlit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sc}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{n}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{it}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlit}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scit}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/sb/tlit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sc}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{n}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{it}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tlit}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scit}{ +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{scsl}{ + <-> ssub * CabinCondensed-TLF/medium/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{sl}{ + <-> ssub * CabinCondensed-TLF/medium/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/mb/tlit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{tlsl}{ + <-> ssub * CabinCondensed-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scsl }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ly1 + <-> ssub * CabinCondensed-TLF/regular/tl }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1 + <-> ssub * CabinCondensed-TLF/regular/sc }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ly1 + <-> ssub * CabinCondensed-TLF/regular/n }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ly1 + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ly1 +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlsl }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ly1 + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlit}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scsl }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlsl}{ - <-> ssub * CabinCondensed-TLF/m/tlit +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tl}{ + <-> ssub * CabinCondensed-TLF/semibold/tl }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scsl +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sc}{ + <-> ssub * CabinCondensed-TLF/semibold/sc }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tl}{ - <-> ssub * CabinCondensed-TLF/b/tl +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{n}{ + <-> ssub * CabinCondensed-TLF/semibold/n }{} -\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sc}{ - <-> ssub * CabinCondensed-TLF/b/sc +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{it}{ + <-> ssub * CabinCondensed-TLF/semibold/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlsl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scit}{ + <-> ssub * CabinCondensed-TLF/semibold/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scsl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tl}{ + <-> ssub * CabinCondensed-TLF/bold/tl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{ + <-> ssub * CabinCondensed-TLF/bold/sc +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{n}{ + <-> ssub * CabinCondensed-TLF/bold/n +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{it}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/sl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlsl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{tlit}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} \DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * CabinCondensed-TLF/b/sl }{} +\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + \DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{tlsl}{ <-> ssub * CabinCondensed-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 index ebbfaa29409..08fafc97829 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{OT1Cabin-Sup.fd} - [2018/05/18 (autoinst) Font definitions for OT1/Cabin-Sup.] + [2019/04/04 (autoinst) Font definitions for OT1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{OT1}{Cabin-Sup}{} -\DeclareFontShape{OT1}{Cabin-Sup}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-sup-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{Cabin-Sup}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Cabin-Sup}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/b/it +\DeclareFontShape{OT1}{Cabin-Sup}{regular}{sl}{ + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{OT1}{Cabin-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Cabin-Sup}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{sb}{it}{ +\DeclareFontShape{OT1}{Cabin-Sup}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/sb/it +\DeclareFontShape{OT1}{Cabin-Sup}{semibold}{sl}{ + <-> ssub * Cabin-Sup/semibold/it }{} -\DeclareFontShape{OT1}{Cabin-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{Cabin-Sup}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{bold}{sl}{ + <-> ssub * Cabin-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{OT1}{Cabin-Sup}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{mb}{it}{ +\DeclareFontShape{OT1}{Cabin-Sup}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Cabin-Sup}{mb}{sl}{ - <-> ssub * Cabin-Sup/mb/it +\DeclareFontShape{OT1}{Cabin-Sup}{medium}{sl}{ + <-> ssub * Cabin-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/regular/sl }{} \DeclareFontShape{OT1}{Cabin-Sup}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-sup-ot1 + <-> ssub * Cabin-Sup/regular/n }{} \DeclareFontShape{OT1}{Cabin-Sup}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-sup-ot1 + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/semibold/sl }{} -\DeclareFontShape{OT1}{Cabin-Sup}{bx}{sl}{ - <-> ssub * Cabin-Sup/b/sl +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{n}{ + <-> ssub * Cabin-Sup/semibold/n +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{sb}{it}{ + <-> ssub * Cabin-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/bold/sl +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{n}{ + <-> ssub * Cabin-Sup/bold/n +}{} + +\DeclareFontShape{OT1}{Cabin-Sup}{b}{it}{ + <-> ssub * Cabin-Sup/bold/it }{} \DeclareFontShape{OT1}{Cabin-Sup}{bx}{n}{ <-> ssub * Cabin-Sup/b/n }{} +\DeclareFontShape{OT1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + \DeclareFontShape{OT1}{Cabin-Sup}{bx}{it}{ <-> ssub * Cabin-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd index 8ba71ef0714..943c58e1aea 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{OT1Cabin-TLF.fd} - [2018/05/18 (autoinst) Font definitions for OT1/Cabin-TLF.] + [2019/04/04 (autoinst) Font definitions for OT1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{OT1}{Cabin-TLF}{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{tl}{ - <-> \Cabin@@scale Cabin-Bold-tlf-titling-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{sc}{ + <-> \Cabin@@scale Cabin-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{scit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{scsl}{ + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{sl}{ + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlsl}{ - <-> ssub * Cabin-TLF/b/tlit +\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{tl}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{ +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{n}{ +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{it}{ +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{tlit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{sl}{ + <-> ssub * Cabin-TLF/semibold/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlsl}{ - <-> ssub * Cabin-TLF/sb/tlit +\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{sc}{ + <-> \Cabin@@scale Cabin-Bold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{scit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{scsl}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{sl}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bold}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tl}{ <-> \Cabin@@scale Cabin-Medium-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{sc}{ +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{n}{ +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{it}{ +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tlit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tlit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{scit}{ +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{scsl}{ + <-> ssub * Cabin-TLF/medium/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{sl}{ + <-> ssub * Cabin-TLF/medium/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{mb}{tlsl}{ - <-> ssub * Cabin-TLF/mb/tlit +\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tlsl}{ + <-> ssub * Cabin-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/regular/scsl }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{tl}{ - <-> \Cabin@@scale Cabin-Regular-tlf-titling-ot1 + <-> ssub * Cabin-TLF/regular/tl }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-ot1 + <-> ssub * Cabin-TLF/regular/sc }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ot1 + <-> ssub * Cabin-TLF/regular/n }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ot1 + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-titling-ot1 +\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/regular/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlsl }{} \DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-ot1 + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit +\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlit}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scsl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlsl}{ - <-> ssub * Cabin-TLF/m/tlit +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tl}{ + <-> ssub * Cabin-TLF/semibold/tl }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scsl}{ - <-> ssub * Cabin-TLF/b/scsl +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{ + <-> ssub * Cabin-TLF/semibold/sc }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tl}{ - <-> ssub * Cabin-TLF/b/tl +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{n}{ + <-> ssub * Cabin-TLF/semibold/n }{} -\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sc}{ - <-> ssub * Cabin-TLF/b/sc +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{it}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/semibold/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{ + <-> ssub * Cabin-TLF/semibold/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlit}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{ + <-> ssub * Cabin-TLF/bold/scsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tl}{ + <-> ssub * Cabin-TLF/bold/tl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{ + <-> ssub * Cabin-TLF/bold/sc +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{n}{ + <-> ssub * Cabin-TLF/bold/n +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{it}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/bold/sl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlsl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{scit}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{b}{tlit}{ + <-> ssub * Cabin-TLF/bold/tlit }{} \DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + \DeclareFontShape{OT1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * Cabin-TLF/b/sl }{} +\DeclareFontShape{OT1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + \DeclareFontShape{OT1}{Cabin-TLF}{bx}{tlsl}{ <-> ssub * Cabin-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 index 1430710a335..49942f6eaa8 100644 --- a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{OT1CabinCondensed-Sup.fd} - [2018/05/18 (autoinst) Font definitions for OT1/CabinCondensed-Sup.] + [2019/04/04 (autoinst) Font definitions for OT1/CabinCondensed-Sup.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{OT1}{CabinCondensed-Sup}{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{sl}{ - <-> ssub * CabinCondensed-Sup/b/it +\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{it}{ +\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{sl}{ - <-> ssub * CabinCondensed-Sup/sb/it +\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/it }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bold}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{it}{ +\DeclareFontShape{OT1}{CabinCondensed-Sup}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{mb}{sl}{ - <-> ssub * CabinCondensed-Sup/mb/it +\DeclareFontShape{OT1}{CabinCondensed-Sup}{medium}{sl}{ + <-> ssub * CabinCondensed-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/sl }{} \DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ot1 + <-> ssub * CabinCondensed-Sup/regular/n }{} \DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ot1 + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{sl}{ - <-> ssub * CabinCondensed-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/sl }{} -\DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{sl}{ - <-> ssub * CabinCondensed-Sup/b/sl +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{n}{ + <-> ssub * CabinCondensed-Sup/semibold/n +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{it}{ + <-> ssub * CabinCondensed-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{n}{ + <-> ssub * CabinCondensed-Sup/bold/n +}{} + +\DeclareFontShape{OT1}{CabinCondensed-Sup}{b}{it}{ + <-> ssub * CabinCondensed-Sup/bold/it }{} \DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{n}{ <-> ssub * CabinCondensed-Sup/b/n }{} +\DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + \DeclareFontShape{OT1}{CabinCondensed-Sup}{bx}{it}{ <-> ssub * CabinCondensed-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd index 4de57208c30..9adb28e5e8e 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{OT1CabinCondensed-TLF.fd} - [2018/05/18 (autoinst) Font definitions for OT1/CabinCondensed-TLF.] + [2019/04/04 (autoinst) Font definitions for OT1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{OT1}{CabinCondensed-TLF}{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ot1 + +% ---- regular ---- + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlsl}{ - <-> ssub * CabinCondensed-TLF/b/tlit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sc}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{n}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{it}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlit}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scit}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/sb/tlit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sc}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{n}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{it}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tlit}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scit}{ +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{scsl}{ + <-> ssub * CabinCondensed-TLF/medium/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{sl}{ + <-> ssub * CabinCondensed-TLF/medium/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/mb/tlit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{tlsl}{ + <-> ssub * CabinCondensed-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scsl }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ot1 + <-> ssub * CabinCondensed-TLF/regular/tl }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1 + <-> ssub * CabinCondensed-TLF/regular/sc }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ot1 + <-> ssub * CabinCondensed-TLF/regular/n }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ot1 + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ot1 +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlsl }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ot1 + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlit}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scsl }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlsl}{ - <-> ssub * CabinCondensed-TLF/m/tlit +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tl}{ + <-> ssub * CabinCondensed-TLF/semibold/tl }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scsl +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sc}{ + <-> ssub * CabinCondensed-TLF/semibold/sc }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tl}{ - <-> ssub * CabinCondensed-TLF/b/tl +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{n}{ + <-> ssub * CabinCondensed-TLF/semibold/n }{} -\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sc}{ - <-> ssub * CabinCondensed-TLF/b/sc +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{it}{ + <-> ssub * CabinCondensed-TLF/semibold/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlsl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scit}{ + <-> ssub * CabinCondensed-TLF/semibold/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scsl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tl}{ + <-> ssub * CabinCondensed-TLF/bold/tl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{ + <-> ssub * CabinCondensed-TLF/bold/sc +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{n}{ + <-> ssub * CabinCondensed-TLF/bold/n +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{it}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/sl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlsl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{tlit}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} \DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * CabinCondensed-TLF/b/sl }{} +\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + \DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{tlsl}{ <-> ssub * CabinCondensed-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 index 824a0f0dda7..88ffc62dca6 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{T1Cabin-Sup.fd} - [2018/05/18 (autoinst) Font definitions for T1/Cabin-Sup.] + [2019/04/04 (autoinst) Font definitions for T1/Cabin-Sup.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{T1}{Cabin-Sup}{} -\DeclareFontShape{T1}{Cabin-Sup}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-sup-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{Cabin-Sup}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-sup-t1 +\DeclareFontShape{T1}{Cabin-Sup}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{b}{sl}{ - <-> ssub * Cabin-Sup/b/it +\DeclareFontShape{T1}{Cabin-Sup}{regular}{sl}{ + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{T1}{Cabin-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{Cabin-Sup}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{sb}{it}{ +\DeclareFontShape{T1}{Cabin-Sup}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{sb}{sl}{ - <-> ssub * Cabin-Sup/sb/it +\DeclareFontShape{T1}{Cabin-Sup}{semibold}{sl}{ + <-> ssub * Cabin-Sup/semibold/it }{} -\DeclareFontShape{T1}{Cabin-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{Cabin-Sup}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{bold}{sl}{ + <-> ssub * Cabin-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{Cabin-Sup}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{mb}{it}{ +\DeclareFontShape{T1}{Cabin-Sup}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-sup-t1 }{} -\DeclareFontShape{T1}{Cabin-Sup}{mb}{sl}{ - <-> ssub * Cabin-Sup/mb/it +\DeclareFontShape{T1}{Cabin-Sup}{medium}{sl}{ + <-> ssub * Cabin-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ + <-> ssub * Cabin-Sup/regular/sl }{} \DeclareFontShape{T1}{Cabin-Sup}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-sup-t1 + <-> ssub * Cabin-Sup/regular/n }{} \DeclareFontShape{T1}{Cabin-Sup}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-sup-t1 + <-> ssub * Cabin-Sup/regular/it }{} -\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{ - <-> ssub * Cabin-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{Cabin-Sup}{sb}{sl}{ + <-> ssub * Cabin-Sup/semibold/sl }{} -\DeclareFontShape{T1}{Cabin-Sup}{bx}{sl}{ - <-> ssub * Cabin-Sup/b/sl +\DeclareFontShape{T1}{Cabin-Sup}{sb}{n}{ + <-> ssub * Cabin-Sup/semibold/n +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{sb}{it}{ + <-> ssub * Cabin-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Cabin-Sup}{b}{sl}{ + <-> ssub * Cabin-Sup/bold/sl +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{b}{n}{ + <-> ssub * Cabin-Sup/bold/n +}{} + +\DeclareFontShape{T1}{Cabin-Sup}{b}{it}{ + <-> ssub * Cabin-Sup/bold/it }{} \DeclareFontShape{T1}{Cabin-Sup}{bx}{n}{ <-> ssub * Cabin-Sup/b/n }{} +\DeclareFontShape{T1}{Cabin-Sup}{bx}{sl}{ + <-> ssub * Cabin-Sup/b/sl +}{} + \DeclareFontShape{T1}{Cabin-Sup}{bx}{it}{ <-> ssub * Cabin-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd index 834fc21a319..9a9234f4440 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{T1Cabin-TLF.fd} - [2018/05/18 (autoinst) Font definitions for T1/Cabin-TLF.] + [2019/04/04 (autoinst) Font definitions for T1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{T1}{Cabin-TLF}{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{tl}{ - <-> \Cabin@@scale Cabin-Bold-tlf-titling-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{Cabin-TLF}{regular}{tl}{ + <-> \Cabin@@scale Cabin-Regular-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ - <-> \Cabin@@scale Cabin-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{Cabin-TLF}{regular}{sc}{ + <-> \Cabin@@scale Cabin-Regular-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{Cabin-TLF}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{tlit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-t1 +\DeclareFontShape{T1}{Cabin-TLF}{regular}{tlit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Cabin-TLF}{regular}{scit}{ + <-> \Cabin@@scale Cabin-Italic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{ - <-> ssub * Cabin-TLF/b/scit +\DeclareFontShape{T1}{Cabin-TLF}{regular}{scsl}{ + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{T1}{Cabin-TLF}{regular}{sl}{ + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{b}{tlsl}{ - <-> ssub * Cabin-TLF/b/tlit +\DeclareFontShape{T1}{Cabin-TLF}{regular}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{tl}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{sc}{ +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{sc}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{n}{ +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{it}{ +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlit}{ +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{tlit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{ +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{scit}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{ - <-> ssub * Cabin-TLF/sb/scit +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{sl}{ + <-> ssub * Cabin-TLF/semibold/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlsl}{ - <-> ssub * Cabin-TLF/sb/tlit +\DeclareFontShape{T1}{Cabin-TLF}{semibold}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{tl}{ + <-> \Cabin@@scale Cabin-Bold-tlf-titling-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{sc}{ + <-> \Cabin@@scale Cabin-Bold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{tlit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-titling-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{scit}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{scsl}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{sl}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bold}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlit }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{T1}{Cabin-TLF}{medium}{tl}{ <-> \Cabin@@scale Cabin-Medium-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{sc}{ +\DeclareFontShape{T1}{Cabin-TLF}{medium}{sc}{ <-> \Cabin@@scale Cabin-Medium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{n}{ +\DeclareFontShape{T1}{Cabin-TLF}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{it}{ +\DeclareFontShape{T1}{Cabin-TLF}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{tlit}{ +\DeclareFontShape{T1}{Cabin-TLF}{medium}{tlit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{scit}{ +\DeclareFontShape{T1}{Cabin-TLF}{medium}{scit}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{scsl}{ - <-> ssub * Cabin-TLF/mb/scit +\DeclareFontShape{T1}{Cabin-TLF}{medium}{scsl}{ + <-> ssub * Cabin-TLF/medium/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{T1}{Cabin-TLF}{medium}{sl}{ + <-> ssub * Cabin-TLF/medium/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{mb}{tlsl}{ - <-> ssub * Cabin-TLF/mb/tlit +\DeclareFontShape{T1}{Cabin-TLF}{medium}{tlsl}{ + <-> ssub * Cabin-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ + <-> ssub * Cabin-TLF/regular/scsl }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{tl}{ - <-> \Cabin@@scale Cabin-Regular-tlf-titling-t1 + <-> ssub * Cabin-TLF/regular/tl }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{ - <-> \Cabin@@scale Cabin-Regular-tlf-sc-t1 + <-> ssub * Cabin-TLF/regular/sc }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-t1 + <-> ssub * Cabin-TLF/regular/n }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-t1 + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{tlit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-titling-t1 +\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/regular/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{m}{tlsl}{ + <-> ssub * Cabin-TLF/regular/tlsl }{} \DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{ - <-> \Cabin@@scale Cabin-Italic-tlf-sc-t1 + <-> ssub * Cabin-TLF/regular/scit }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{ - <-> ssub * Cabin-TLF/m/scit +\DeclareFontShape{T1}{Cabin-TLF}{m}{tlit}{ + <-> ssub * Cabin-TLF/regular/tlit }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{ + <-> ssub * Cabin-TLF/semibold/scsl }{} -\DeclareFontShape{T1}{Cabin-TLF}{m}{tlsl}{ - <-> ssub * Cabin-TLF/m/tlit +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tl}{ + <-> ssub * Cabin-TLF/semibold/tl }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{scsl}{ - <-> ssub * Cabin-TLF/b/scsl +\DeclareFontShape{T1}{Cabin-TLF}{sb}{sc}{ + <-> ssub * Cabin-TLF/semibold/sc }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{tl}{ - <-> ssub * Cabin-TLF/b/tl +\DeclareFontShape{T1}{Cabin-TLF}{sb}{n}{ + <-> ssub * Cabin-TLF/semibold/n }{} -\DeclareFontShape{T1}{Cabin-TLF}{bx}{sc}{ - <-> ssub * Cabin-TLF/b/sc +\DeclareFontShape{T1}{Cabin-TLF}{sb}{it}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/semibold/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlsl}{ + <-> ssub * Cabin-TLF/semibold/tlsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{ + <-> ssub * Cabin-TLF/semibold/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlit}{ + <-> ssub * Cabin-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{ + <-> ssub * Cabin-TLF/bold/scsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{tl}{ + <-> ssub * Cabin-TLF/bold/tl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{ + <-> ssub * Cabin-TLF/bold/sc +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{n}{ + <-> ssub * Cabin-TLF/bold/n +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{it}{ + <-> ssub * Cabin-TLF/bold/it +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/bold/sl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{tlsl}{ + <-> ssub * Cabin-TLF/bold/tlsl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{scit}{ + <-> ssub * Cabin-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{b}{tlit}{ + <-> ssub * Cabin-TLF/bold/tlit }{} \DeclareFontShape{T1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} +\DeclareFontShape{T1}{Cabin-TLF}{bx}{sc}{ + <-> ssub * Cabin-TLF/b/sc +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{tl}{ + <-> ssub * Cabin-TLF/b/tl +}{} + +\DeclareFontShape{T1}{Cabin-TLF}{bx}{scsl}{ + <-> ssub * Cabin-TLF/b/scsl +}{} + \DeclareFontShape{T1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * Cabin-TLF/b/sl }{} +\DeclareFontShape{T1}{Cabin-TLF}{bx}{tlit}{ + <-> ssub * Cabin-TLF/b/tlit +}{} + \DeclareFontShape{T1}{Cabin-TLF}{bx}{tlsl}{ <-> ssub * Cabin-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 index ebe4016f937..0c1bd9e2754 100644 --- a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd +++ b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{T1CabinCondensed-Sup.fd} - [2018/05/18 (autoinst) Font definitions for T1/CabinCondensed-Sup.] + [2019/04/04 (autoinst) Font definitions for T1/CabinCondensed-Sup.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{T1}{CabinCondensed-Sup}{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-t1 +\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{sl}{ - <-> ssub * CabinCondensed-Sup/b/it +\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{it}{ +\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{sl}{ - <-> ssub * CabinCondensed-Sup/sb/it +\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/it }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{bold}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{T1}{CabinCondensed-Sup}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{it}{ +\DeclareFontShape{T1}{CabinCondensed-Sup}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{mb}{sl}{ - <-> ssub * CabinCondensed-Sup/mb/it +\DeclareFontShape{T1}{CabinCondensed-Sup}{medium}{sl}{ + <-> ssub * CabinCondensed-Sup/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{sl}{ + <-> ssub * CabinCondensed-Sup/regular/sl }{} \DeclareFontShape{T1}{CabinCondensed-Sup}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-t1 + <-> ssub * CabinCondensed-Sup/regular/n }{} \DeclareFontShape{T1}{CabinCondensed-Sup}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-t1 + <-> ssub * CabinCondensed-Sup/regular/it }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{sl}{ - <-> ssub * CabinCondensed-Sup/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{sl}{ + <-> ssub * CabinCondensed-Sup/semibold/sl }{} -\DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{sl}{ - <-> ssub * CabinCondensed-Sup/b/sl +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{n}{ + <-> ssub * CabinCondensed-Sup/semibold/n +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{it}{ + <-> ssub * CabinCondensed-Sup/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{sl}{ + <-> ssub * CabinCondensed-Sup/bold/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{n}{ + <-> ssub * CabinCondensed-Sup/bold/n +}{} + +\DeclareFontShape{T1}{CabinCondensed-Sup}{b}{it}{ + <-> ssub * CabinCondensed-Sup/bold/it }{} \DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{n}{ <-> ssub * CabinCondensed-Sup/b/n }{} +\DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{sl}{ + <-> ssub * CabinCondensed-Sup/b/sl +}{} + \DeclareFontShape{T1}{CabinCondensed-Sup}{bx}{it}{ <-> ssub * CabinCondensed-Sup/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd index 0f61fe168c2..2afb49f2c4f 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{T1CabinCondensed-TLF.fd} - [2018/05/18 (autoinst) Font definitions for T1/CabinCondensed-TLF.] + [2019/04/04 (autoinst) Font definitions for T1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,166 +11,298 @@ \DeclareFontFamily{T1}{CabinCondensed-TLF}{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-t1 + +% ---- regular ---- + +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scit +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlsl}{ - <-> ssub * CabinCondensed-TLF/b/tlit +\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tl}{ + +% ---- semibold ---- + +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sc}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{n}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{it}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlit}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scit}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scsl}{ - <-> ssub * CabinCondensed-TLF/sb/scit +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/sb/tlit +\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% ---- bold ---- + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{tl}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-titling-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{sc}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{tlit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-titling-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{scit}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bold}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tl}{ + +% ---- medium ---- + +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{tl}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sc}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{sc}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{n}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{it}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tlit}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{tlit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scit}{ +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{scit}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scsl}{ - <-> ssub * CabinCondensed-TLF/mb/scit +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{scsl}{ + <-> ssub * CabinCondensed-TLF/medium/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{sl}{ + <-> ssub * CabinCondensed-TLF/medium/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{tlsl}{ - <-> ssub * CabinCondensed-TLF/mb/tlit +\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{tlsl}{ + <-> ssub * CabinCondensed-TLF/medium/tlit +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scsl}{ + <-> ssub * CabinCondensed-TLF/regular/scsl }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tl}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-t1 + <-> ssub * CabinCondensed-TLF/regular/tl }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1 + <-> ssub * CabinCondensed-TLF/regular/sc }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-t1 + <-> ssub * CabinCondensed-TLF/regular/n }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-t1 + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-t1 +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlsl}{ + <-> ssub * CabinCondensed-TLF/regular/tlsl }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scit}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-t1 + <-> ssub * CabinCondensed-TLF/regular/scit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scsl}{ - <-> ssub * CabinCondensed-TLF/m/scit +\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlit}{ + <-> ssub * CabinCondensed-TLF/regular/tlit }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scsl}{ + <-> ssub * CabinCondensed-TLF/semibold/scsl }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlsl}{ - <-> ssub * CabinCondensed-TLF/m/tlit +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tl}{ + <-> ssub * CabinCondensed-TLF/semibold/tl }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scsl}{ - <-> ssub * CabinCondensed-TLF/b/scsl +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sc}{ + <-> ssub * CabinCondensed-TLF/semibold/sc }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tl}{ - <-> ssub * CabinCondensed-TLF/b/tl +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{n}{ + <-> ssub * CabinCondensed-TLF/semibold/n }{} -\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sc}{ - <-> ssub * CabinCondensed-TLF/b/sc +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{it}{ + <-> ssub * CabinCondensed-TLF/semibold/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlsl}{ + <-> ssub * CabinCondensed-TLF/semibold/tlsl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scit}{ + <-> ssub * CabinCondensed-TLF/semibold/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tlit}{ + <-> ssub * CabinCondensed-TLF/semibold/tlit +}{} + + +% b --> bold + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scsl}{ + <-> ssub * CabinCondensed-TLF/bold/scsl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tl}{ + <-> ssub * CabinCondensed-TLF/bold/tl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{ + <-> ssub * CabinCondensed-TLF/bold/sc +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{n}{ + <-> ssub * CabinCondensed-TLF/bold/n +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{it}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/sl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlsl}{ + <-> ssub * CabinCondensed-TLF/bold/tlsl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{ + <-> ssub * CabinCondensed-TLF/bold/scit +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{tlit}{ + <-> ssub * CabinCondensed-TLF/bold/tlit }{} \DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sc}{ + <-> ssub * CabinCondensed-TLF/b/sc +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tl}{ + <-> ssub * CabinCondensed-TLF/b/tl +}{} + +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scsl}{ + <-> ssub * CabinCondensed-TLF/b/scsl +}{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} @@ -179,6 +311,10 @@ <-> ssub * CabinCondensed-TLF/b/sl }{} +\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tlit}{ + <-> ssub * CabinCondensed-TLF/b/tlit +}{} + \DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{tlsl}{ <-> ssub * CabinCondensed-TLF/b/tlsl }{} @@ -187,8 +323,4 @@ <-> 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 53a7cc4fc7b..15d74d8f030 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{TS1Cabin-TLF.fd} - [2018/05/18 (autoinst) Font definitions for TS1/Cabin-TLF.] + [2019/04/04 (autoinst) Font definitions for TS1/Cabin-TLF.] \expandafter\ifx\csname Cabin@scale\endcsname\relax \let\Cabin@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{TS1}{Cabin-TLF}{} -\DeclareFontShape{TS1}{Cabin-TLF}{b}{n}{ - <-> \Cabin@@scale Cabin-Bold-tlf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{Cabin-TLF}{regular}{n}{ + <-> \Cabin@@scale Cabin-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{b}{it}{ - <-> \Cabin@@scale Cabin-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Cabin-TLF}{regular}{it}{ + <-> \Cabin@@scale Cabin-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{ - <-> ssub * Cabin-TLF/b/it +\DeclareFontShape{TS1}{Cabin-TLF}{regular}{sl}{ + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{TS1}{Cabin-TLF}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{TS1}{Cabin-TLF}{semibold}{n}{ <-> \Cabin@@scale Cabin-SemiBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{sb}{it}{ +\DeclareFontShape{TS1}{Cabin-TLF}{semibold}{it}{ <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{sb}{sl}{ - <-> ssub * Cabin-TLF/sb/it +\DeclareFontShape{TS1}{Cabin-TLF}{semibold}{sl}{ + <-> ssub * Cabin-TLF/semibold/it }{} -\DeclareFontShape{TS1}{Cabin-TLF}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{TS1}{Cabin-TLF}{bold}{n}{ + <-> \Cabin@@scale Cabin-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{bold}{it}{ + <-> \Cabin@@scale Cabin-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{bold}{sl}{ + <-> ssub * Cabin-TLF/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{TS1}{Cabin-TLF}{medium}{n}{ <-> \Cabin@@scale Cabin-Medium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{mb}{it}{ +\DeclareFontShape{TS1}{Cabin-TLF}{medium}{it}{ <-> \Cabin@@scale Cabin-MediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Cabin-TLF}{mb}{sl}{ - <-> ssub * Cabin-TLF/mb/it +\DeclareFontShape{TS1}{Cabin-TLF}{medium}{sl}{ + <-> ssub * Cabin-TLF/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ + <-> ssub * Cabin-TLF/regular/sl }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{n}{ - <-> \Cabin@@scale Cabin-Regular-tlf-ts1 + <-> ssub * Cabin-TLF/regular/n }{} \DeclareFontShape{TS1}{Cabin-TLF}{m}{it}{ - <-> \Cabin@@scale Cabin-Italic-tlf-ts1 + <-> ssub * Cabin-TLF/regular/it }{} -\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{ - <-> ssub * Cabin-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{TS1}{Cabin-TLF}{sb}{sl}{ + <-> ssub * Cabin-TLF/semibold/sl }{} -\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sl}{ - <-> ssub * Cabin-TLF/b/sl +\DeclareFontShape{TS1}{Cabin-TLF}{sb}{n}{ + <-> ssub * Cabin-TLF/semibold/n +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{sb}{it}{ + <-> ssub * Cabin-TLF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{ + <-> ssub * Cabin-TLF/bold/sl +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{b}{n}{ + <-> ssub * Cabin-TLF/bold/n +}{} + +\DeclareFontShape{TS1}{Cabin-TLF}{b}{it}{ + <-> ssub * Cabin-TLF/bold/it }{} \DeclareFontShape{TS1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{} +\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sl}{ + <-> ssub * Cabin-TLF/b/sl +}{} + \DeclareFontShape{TS1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd index 75154f820b0..f99d45e20fa 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 2018/05/18 +%% Generated by autoinst on 2019/04/04 %% \ProvidesFile{TS1CabinCondensed-TLF.fd} - [2018/05/18 (autoinst) Font definitions for TS1/CabinCondensed-TLF.] + [2019/04/04 (autoinst) Font definitions for TS1/CabinCondensed-TLF.] \expandafter\ifx\csname CabinCondensed@scale\endcsname\relax \let\CabinCondensed@@scale\@empty @@ -11,62 +11,122 @@ \DeclareFontFamily{TS1}{CabinCondensed-TLF}{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ts1 + +% ---- regular ---- + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{sl}{ - <-> ssub * CabinCondensed-TLF/b/it +\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{n}{ + +% ---- semibold ---- + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{n}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{it}{ +\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{it}{ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{sl}{ - <-> ssub * CabinCondensed-TLF/sb/it +\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/it }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{n}{ + +% ---- bold ---- + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bold}{n}{ + <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bold}{it}{ + <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bold}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/it +}{} + + +% ---- medium ---- + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{medium}{n}{ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{it}{ +\DeclareFontShape{TS1}{CabinCondensed-TLF}{medium}{it}{ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{sl}{ - <-> ssub * CabinCondensed-TLF/mb/it +\DeclareFontShape{TS1}{CabinCondensed-TLF}{medium}{sl}{ + <-> ssub * CabinCondensed-TLF/medium/it +}{} + +% +% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ==== +% + +% m --> regular + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{sl}{ + <-> ssub * CabinCondensed-TLF/regular/sl }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{n}{ - <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1 + <-> ssub * CabinCondensed-TLF/regular/n }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{ - <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ts1 + <-> ssub * CabinCondensed-TLF/regular/it }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{sl}{ - <-> ssub * CabinCondensed-TLF/m/it + +% sb --> semibold + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{sl}{ + <-> ssub * CabinCondensed-TLF/semibold/sl }{} -\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{sl}{ - <-> ssub * CabinCondensed-TLF/b/sl +\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{n}{ + <-> ssub * CabinCondensed-TLF/semibold/n +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{it}{ + <-> ssub * CabinCondensed-TLF/semibold/it +}{} + + +% b --> bold + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{sl}{ + <-> ssub * CabinCondensed-TLF/bold/sl +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{n}{ + <-> ssub * CabinCondensed-TLF/bold/n +}{} + +\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{it}{ + <-> ssub * CabinCondensed-TLF/bold/it }{} \DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{} +\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{sl}{ + <-> ssub * CabinCondensed-TLF/b/sl +}{} + \DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{} diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty index ccae8e7db54..1910e4445dd 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} - [2018/05/18 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] + [2019/04/04 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -45,10 +45,10 @@ \else % type1 - \def\bfseries@sf{b} - \ifcabin@semibold\def\bfseries@sf{sb}\fi - \def\mdseries@sf{m} - \ifcabin@medium\def\mdseries@sf{mb}\fi + \def\bfseries@sf{bold} + \ifcabin@semibold\def\bfseries@sf{semibold}\fi + \def\mdseries@sf{regular} + \ifcabin@medium\def\mdseries@sf{medium}\fi \fi \ifcabin@otf -- cgit v1.2.3