summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty55
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1Cabin-Sup.fd111
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd293
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd134
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd326
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd111
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd293
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd134
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd326
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd111
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd293
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd134
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd326
-rw-r--r--Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd111
-rw-r--r--Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd134
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty31
16 files changed, 1031 insertions, 1892 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty b/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty
deleted file mode 100644
index 01d9de3ebc0..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/CabinCondensed.sty
+++ /dev/null
@@ -1,55 +0,0 @@
-%% 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 15c0f1c3963..f50003e5d75 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{LY1Cabin-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/Cabin-Sup.]
+ [2019/04/24 (autoinst) Font definitions for LY1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -57,6 +57,36 @@
}{}
+% ---- boldcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{boldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{LY1}{Cabin-Sup}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{condensed}{sl}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% ---- medium ----
\DeclareFontShape{LY1}{Cabin-Sup}{medium}{n}{
@@ -71,10 +101,55 @@
<-> ssub * Cabin-Sup/medium/it
}{}
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-Sup/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{LY1}{Cabin-Sup}{c}{sl}{
+ <-> ssub * Cabin-Sup/condensed/sl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{c}{n}{
+ <-> ssub * Cabin-Sup/condensed/n
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{c}{it}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% m --> regular
\DeclareFontShape{LY1}{Cabin-Sup}{m}{sl}{
@@ -90,6 +165,21 @@
}{}
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{LY1}{Cabin-Sup}{sbc}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/sl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{sbc}{n}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/n
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{sbc}{it}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
+
% sb --> semibold
\DeclareFontShape{LY1}{Cabin-Sup}{sb}{sl}{
@@ -105,6 +195,21 @@
}{}
+% bc --> boldcondensed
+
+\DeclareFontShape{LY1}{Cabin-Sup}{bc}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/sl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{bc}{n}{
+ <-> ssub * Cabin-Sup/boldcondensed/n
+}{}
+
+\DeclareFontShape{LY1}{Cabin-Sup}{bc}{it}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
% b --> bold
\DeclareFontShape{LY1}{Cabin-Sup}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
index 5f24b11e3ff..6ee16fcb58a 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{LY1Cabin-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/Cabin-TLF.]
+ [2019/04/24 (autoinst) Font definitions for LY1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -14,10 +14,6 @@
% ---- regular ----
-\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tl}{
- <-> \Cabin@@scale Cabin-Regular-tlf-titling-ly1
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{regular}{sc}{
<-> \Cabin@@scale Cabin-Regular-tlf-sc-ly1
}{}
@@ -30,10 +26,6 @@
<-> \Cabin@@scale Cabin-Italic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tlit}{
- <-> \Cabin@@scale Cabin-Italic-tlf-titling-ly1
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{regular}{scit}{
<-> \Cabin@@scale Cabin-Italic-tlf-sc-ly1
}{}
@@ -46,17 +38,9 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{regular}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlit
-}{}
-
% ---- semibold ----
-\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{tl}{
- <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ly1
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{sc}{
<-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ly1
}{}
@@ -69,10 +53,6 @@
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{tlit}{
- <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ly1
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{semibold}{scit}{
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ly1
}{}
@@ -85,17 +65,9 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\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
}{}
@@ -108,10 +80,6 @@
<-> \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
}{}
@@ -124,17 +92,63 @@
<-> ssub * Cabin-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{bold}{tlsl}{
- <-> ssub * Cabin-TLF/bold/tlit
+
+% ---- boldcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-ly1
}{}
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-ly1
+}{}
-% ---- medium ----
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{boldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-ly1
+}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tl}{
- <-> \Cabin@@scale Cabin-Medium-tlf-titling-ly1
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
+\DeclareFontShape{LY1}{Cabin-TLF}{condensed}{sl}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+
+% ---- medium ----
+
\DeclareFontShape{LY1}{Cabin-TLF}{medium}{sc}{
<-> \Cabin@@scale Cabin-Medium-tlf-sc-ly1
}{}
@@ -147,10 +161,6 @@
<-> \Cabin@@scale Cabin-MediumItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tlit}{
- <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ly1
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{medium}{scit}{
<-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ly1
}{}
@@ -163,22 +173,99 @@
<-> ssub * Cabin-TLF/medium/it
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{medium}{tlsl}{
- <-> ssub * Cabin-TLF/medium/tlit
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/scit
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{sl}{
+ <-> ssub * Cabin-TLF/condensed/sl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scsl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{sc}{
+ <-> ssub * Cabin-TLF/condensed/sc
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{n}{
+ <-> ssub * Cabin-TLF/condensed/n
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{it}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{c}{scit}{
+ <-> ssub * Cabin-TLF/condensed/scit
+}{}
+
+
% m --> regular
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
+\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{
+ <-> ssub * Cabin-TLF/regular/sl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{tl}{
- <-> ssub * Cabin-TLF/regular/tl
+\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{m}{sc}{
@@ -193,31 +280,46 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
+\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{
+ <-> ssub * Cabin-TLF/regular/scit
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlsl
+
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scsl
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{sc}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sc
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{n}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/n
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{m}{tlit}{
- <-> ssub * Cabin-TLF/regular/tlit
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{it}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{sbc}{scit}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
}{}
% sb --> semibold
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{
- <-> ssub * Cabin-TLF/semibold/scsl
+\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{
+ <-> ssub * Cabin-TLF/semibold/sl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tl}{
- <-> ssub * Cabin-TLF/semibold/tl
+\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scsl}{
+ <-> ssub * Cabin-TLF/semibold/scsl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sc}{
@@ -232,31 +334,46 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{sl}{
- <-> ssub * Cabin-TLF/semibold/sl
+\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{
+ <-> ssub * Cabin-TLF/semibold/scit
+}{}
+
+
+% bc --> boldcondensed
+
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/sl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlsl}{
- <-> ssub * Cabin-TLF/semibold/tlsl
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scsl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{scit}{
- <-> ssub * Cabin-TLF/semibold/scit
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{sc}{
+ <-> ssub * Cabin-TLF/boldcondensed/sc
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{sb}{tlit}{
- <-> ssub * Cabin-TLF/semibold/tlit
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{n}{
+ <-> ssub * Cabin-TLF/boldcondensed/n
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{it}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{bc}{scit}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
}{}
% b --> bold
-\DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{
- <-> ssub * Cabin-TLF/bold/scsl
+\DeclareFontShape{LY1}{Cabin-TLF}{b}{sl}{
+ <-> ssub * Cabin-TLF/bold/sl
}{}
-\DeclareFontShape{LY1}{Cabin-TLF}{b}{tl}{
- <-> ssub * Cabin-TLF/bold/tl
+\DeclareFontShape{LY1}{Cabin-TLF}{b}{scsl}{
+ <-> ssub * Cabin-TLF/bold/scsl
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{b}{sc}{
@@ -271,22 +388,10 @@
<-> 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
}{}
@@ -295,28 +400,16 @@
<-> 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
-}{}
-
\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sl}{
<-> 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
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{it}{
+ <-> ssub * Cabin-TLF/b/it
}{}
\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scit}{
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd
deleted file mode 100644
index 9887768c726..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-Sup.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{LY1CabinCondensed-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/CabinCondensed-Sup.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{CabinCondensed-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{regular}{sl}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{semibold}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/it
-}{}
-
-
-% ---- 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}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ly1
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{m}{it}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{LY1}{CabinCondensed-Sup}{sb}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/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
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd
deleted file mode 100644
index 2dcd1a69c18..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd
+++ /dev/null
@@ -1,326 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{LY1CabinCondensed-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for LY1/CabinCondensed-TLF.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{CabinCondensed-TLF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{scsl}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{sl}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{regular}{tlsl}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scit
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{semibold}{sl}{
- <-> ssub * CabinCondensed-TLF/semibold/it
-}{}
-
-\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
-}{}
-
-
-% ---- medium ----
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{scsl}{
- <-> ssub * CabinCondensed-TLF/medium/scit
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{medium}{sl}{
- <-> ssub * CabinCondensed-TLF/medium/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/tl
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{
- <-> ssub * CabinCondensed-TLF/regular/sc
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{n}{
- <-> ssub * CabinCondensed-TLF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{tlit}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scsl
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{tl}{
- <-> ssub * CabinCondensed-TLF/semibold/tl
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sc}{
- <-> ssub * CabinCondensed-TLF/semibold/sc
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{n}{
- <-> ssub * CabinCondensed-TLF/semibold/n
-}{}
-
-\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
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sl}{
- <-> 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
-}{}
-
-\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scit}{
- <-> ssub * CabinCondensed-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-Sup.fd
index 08fafc97829..a08f6e02ef3 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{OT1Cabin-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/Cabin-Sup.]
+ [2019/04/24 (autoinst) Font definitions for OT1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -57,6 +57,36 @@
}{}
+% ---- boldcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{boldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{OT1}{Cabin-Sup}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{condensed}{sl}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% ---- medium ----
\DeclareFontShape{OT1}{Cabin-Sup}{medium}{n}{
@@ -71,10 +101,55 @@
<-> ssub * Cabin-Sup/medium/it
}{}
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-Sup/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{OT1}{Cabin-Sup}{c}{sl}{
+ <-> ssub * Cabin-Sup/condensed/sl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{c}{n}{
+ <-> ssub * Cabin-Sup/condensed/n
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{c}{it}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% m --> regular
\DeclareFontShape{OT1}{Cabin-Sup}{m}{sl}{
@@ -90,6 +165,21 @@
}{}
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{OT1}{Cabin-Sup}{sbc}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/sl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{sbc}{n}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/n
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{sbc}{it}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
+
% sb --> semibold
\DeclareFontShape{OT1}{Cabin-Sup}{sb}{sl}{
@@ -105,6 +195,21 @@
}{}
+% bc --> boldcondensed
+
+\DeclareFontShape{OT1}{Cabin-Sup}{bc}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/sl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{bc}{n}{
+ <-> ssub * Cabin-Sup/boldcondensed/n
+}{}
+
+\DeclareFontShape{OT1}{Cabin-Sup}{bc}{it}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
% b --> bold
\DeclareFontShape{OT1}{Cabin-Sup}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
index 943c58e1aea..dfc9786dda6 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{OT1Cabin-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/Cabin-TLF.]
+ [2019/04/24 (autoinst) Font definitions for OT1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -14,10 +14,6 @@
% ---- regular ----
-\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tl}{
- <-> \Cabin@@scale Cabin-Regular-tlf-titling-ot1
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{regular}{sc}{
<-> \Cabin@@scale Cabin-Regular-tlf-sc-ot1
}{}
@@ -30,10 +26,6 @@
<-> \Cabin@@scale Cabin-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tlit}{
- <-> \Cabin@@scale Cabin-Italic-tlf-titling-ot1
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{regular}{scit}{
<-> \Cabin@@scale Cabin-Italic-tlf-sc-ot1
}{}
@@ -46,17 +38,9 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{regular}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlit
-}{}
-
% ---- semibold ----
-\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{tl}{
- <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-ot1
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{sc}{
<-> \Cabin@@scale Cabin-SemiBold-tlf-sc-ot1
}{}
@@ -69,10 +53,6 @@
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{tlit}{
- <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-ot1
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{semibold}{scit}{
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-ot1
}{}
@@ -85,17 +65,9 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\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
}{}
@@ -108,10 +80,6 @@
<-> \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
}{}
@@ -124,17 +92,63 @@
<-> ssub * Cabin-TLF/bold/it
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{bold}{tlsl}{
- <-> ssub * Cabin-TLF/bold/tlit
+
+% ---- boldcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-ot1
+}{}
-% ---- medium ----
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{boldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-ot1
+}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tl}{
- <-> \Cabin@@scale Cabin-Medium-tlf-titling-ot1
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
+\DeclareFontShape{OT1}{Cabin-TLF}{condensed}{sl}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+
+% ---- medium ----
+
\DeclareFontShape{OT1}{Cabin-TLF}{medium}{sc}{
<-> \Cabin@@scale Cabin-Medium-tlf-sc-ot1
}{}
@@ -147,10 +161,6 @@
<-> \Cabin@@scale Cabin-MediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tlit}{
- <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-ot1
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{medium}{scit}{
<-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-ot1
}{}
@@ -163,22 +173,99 @@
<-> ssub * Cabin-TLF/medium/it
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{medium}{tlsl}{
- <-> ssub * Cabin-TLF/medium/tlit
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/scit
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{sl}{
+ <-> ssub * Cabin-TLF/condensed/sl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scsl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{sc}{
+ <-> ssub * Cabin-TLF/condensed/sc
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{n}{
+ <-> ssub * Cabin-TLF/condensed/n
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{it}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{c}{scit}{
+ <-> ssub * Cabin-TLF/condensed/scit
+}{}
+
+
% m --> regular
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
+\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{
+ <-> ssub * Cabin-TLF/regular/sl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{tl}{
- <-> ssub * Cabin-TLF/regular/tl
+\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{m}{sc}{
@@ -193,31 +280,46 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
+\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{
+ <-> ssub * Cabin-TLF/regular/scit
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlsl
+
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scsl
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{sc}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sc
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{n}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/n
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{m}{tlit}{
- <-> ssub * Cabin-TLF/regular/tlit
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{it}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{sbc}{scit}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
}{}
% sb --> semibold
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{
- <-> ssub * Cabin-TLF/semibold/scsl
+\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{
+ <-> ssub * Cabin-TLF/semibold/sl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tl}{
- <-> ssub * Cabin-TLF/semibold/tl
+\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scsl}{
+ <-> ssub * Cabin-TLF/semibold/scsl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sc}{
@@ -232,31 +334,46 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{sl}{
- <-> ssub * Cabin-TLF/semibold/sl
+\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{
+ <-> ssub * Cabin-TLF/semibold/scit
+}{}
+
+
+% bc --> boldcondensed
+
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/sl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlsl}{
- <-> ssub * Cabin-TLF/semibold/tlsl
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scsl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{scit}{
- <-> ssub * Cabin-TLF/semibold/scit
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{sc}{
+ <-> ssub * Cabin-TLF/boldcondensed/sc
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{sb}{tlit}{
- <-> ssub * Cabin-TLF/semibold/tlit
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{n}{
+ <-> ssub * Cabin-TLF/boldcondensed/n
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{it}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{bc}{scit}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
}{}
% b --> bold
-\DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{
- <-> ssub * Cabin-TLF/bold/scsl
+\DeclareFontShape{OT1}{Cabin-TLF}{b}{sl}{
+ <-> ssub * Cabin-TLF/bold/sl
}{}
-\DeclareFontShape{OT1}{Cabin-TLF}{b}{tl}{
- <-> ssub * Cabin-TLF/bold/tl
+\DeclareFontShape{OT1}{Cabin-TLF}{b}{scsl}{
+ <-> ssub * Cabin-TLF/bold/scsl
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{b}{sc}{
@@ -271,22 +388,10 @@
<-> 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
}{}
@@ -295,28 +400,16 @@
<-> 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
-}{}
-
\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sl}{
<-> 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
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{it}{
+ <-> ssub * Cabin-TLF/b/it
}{}
\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scit}{
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd
deleted file mode 100644
index 49942f6eaa8..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-Sup.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{OT1CabinCondensed-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/CabinCondensed-Sup.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{CabinCondensed-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{regular}{sl}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{semibold}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/it
-}{}
-
-
-% ---- 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}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-ot1
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{m}{it}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{OT1}{CabinCondensed-Sup}{sb}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/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
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd
deleted file mode 100644
index 9adb28e5e8e..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd
+++ /dev/null
@@ -1,326 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{OT1CabinCondensed-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for OT1/CabinCondensed-TLF.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{CabinCondensed-TLF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{scsl}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{sl}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{regular}{tlsl}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scit
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{semibold}{sl}{
- <-> ssub * CabinCondensed-TLF/semibold/it
-}{}
-
-\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
-}{}
-
-
-% ---- medium ----
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{scsl}{
- <-> ssub * CabinCondensed-TLF/medium/scit
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{medium}{sl}{
- <-> ssub * CabinCondensed-TLF/medium/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/tl
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{
- <-> ssub * CabinCondensed-TLF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{n}{
- <-> ssub * CabinCondensed-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{tlit}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scsl
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{tl}{
- <-> ssub * CabinCondensed-TLF/semibold/tl
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sc}{
- <-> ssub * CabinCondensed-TLF/semibold/sc
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{n}{
- <-> ssub * CabinCondensed-TLF/semibold/n
-}{}
-
-\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
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sl}{
- <-> 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
-}{}
-
-\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scit}{
- <-> ssub * CabinCondensed-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-Sup.fd
index 88ffc62dca6..f0891614ad2 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{T1Cabin-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for T1/Cabin-Sup.]
+ [2019/04/24 (autoinst) Font definitions for T1/Cabin-Sup.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -57,6 +57,36 @@
}{}
+% ---- boldcondensed ----
+
+\DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{boldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{T1}{Cabin-Sup}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{condensed}{sl}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% ---- medium ----
\DeclareFontShape{T1}{Cabin-Sup}{medium}{n}{
@@ -71,10 +101,55 @@
<-> ssub * Cabin-Sup/medium/it
}{}
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-Sup/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{T1}{Cabin-Sup}{c}{sl}{
+ <-> ssub * Cabin-Sup/condensed/sl
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{c}{n}{
+ <-> ssub * Cabin-Sup/condensed/n
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{c}{it}{
+ <-> ssub * Cabin-Sup/condensed/it
+}{}
+
+
% m --> regular
\DeclareFontShape{T1}{Cabin-Sup}{m}{sl}{
@@ -90,6 +165,21 @@
}{}
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{T1}{Cabin-Sup}{sbc}{sl}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/sl
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{sbc}{n}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/n
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{sbc}{it}{
+ <-> ssub * Cabin-Sup/semiboldcondensed/it
+}{}
+
+
% sb --> semibold
\DeclareFontShape{T1}{Cabin-Sup}{sb}{sl}{
@@ -105,6 +195,21 @@
}{}
+% bc --> boldcondensed
+
+\DeclareFontShape{T1}{Cabin-Sup}{bc}{sl}{
+ <-> ssub * Cabin-Sup/boldcondensed/sl
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{bc}{n}{
+ <-> ssub * Cabin-Sup/boldcondensed/n
+}{}
+
+\DeclareFontShape{T1}{Cabin-Sup}{bc}{it}{
+ <-> ssub * Cabin-Sup/boldcondensed/it
+}{}
+
+
% b --> bold
\DeclareFontShape{T1}{Cabin-Sup}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
index 9a9234f4440..f57a6264e12 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{T1Cabin-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/Cabin-TLF.]
+ [2019/04/24 (autoinst) Font definitions for T1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -14,10 +14,6 @@
% ---- regular ----
-\DeclareFontShape{T1}{Cabin-TLF}{regular}{tl}{
- <-> \Cabin@@scale Cabin-Regular-tlf-titling-t1
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{regular}{sc}{
<-> \Cabin@@scale Cabin-Regular-tlf-sc-t1
}{}
@@ -30,10 +26,6 @@
<-> \Cabin@@scale Cabin-Italic-tlf-t1
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{regular}{tlit}{
- <-> \Cabin@@scale Cabin-Italic-tlf-titling-t1
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{regular}{scit}{
<-> \Cabin@@scale Cabin-Italic-tlf-sc-t1
}{}
@@ -46,17 +38,9 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{regular}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlit
-}{}
-
% ---- semibold ----
-\DeclareFontShape{T1}{Cabin-TLF}{semibold}{tl}{
- <-> \Cabin@@scale Cabin-SemiBold-tlf-titling-t1
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{semibold}{sc}{
<-> \Cabin@@scale Cabin-SemiBold-tlf-sc-t1
}{}
@@ -69,10 +53,6 @@
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{semibold}{tlit}{
- <-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-titling-t1
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{semibold}{scit}{
<-> \Cabin@@scale Cabin-SemiBoldItalic-tlf-sc-t1
}{}
@@ -85,17 +65,9 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\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
}{}
@@ -108,10 +80,6 @@
<-> \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
}{}
@@ -124,17 +92,63 @@
<-> ssub * Cabin-TLF/bold/it
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{bold}{tlsl}{
- <-> ssub * Cabin-TLF/bold/tlit
+
+% ---- boldcondensed ----
+
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-sc-t1
}{}
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-t1
+}{}
-% ---- medium ----
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{boldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-sc-t1
+}{}
-\DeclareFontShape{T1}{Cabin-TLF}{medium}{tl}{
- <-> \Cabin@@scale Cabin-Medium-tlf-titling-t1
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scit
}{}
+\DeclareFontShape{T1}{Cabin-TLF}{condensed}{sl}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+
+% ---- medium ----
+
\DeclareFontShape{T1}{Cabin-TLF}{medium}{sc}{
<-> \Cabin@@scale Cabin-Medium-tlf-sc-t1
}{}
@@ -147,10 +161,6 @@
<-> \Cabin@@scale Cabin-MediumItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{medium}{tlit}{
- <-> \Cabin@@scale Cabin-MediumItalic-tlf-titling-t1
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{medium}{scit}{
<-> \Cabin@@scale Cabin-MediumItalic-tlf-sc-t1
}{}
@@ -163,22 +173,99 @@
<-> ssub * Cabin-TLF/medium/it
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{medium}{tlsl}{
- <-> ssub * Cabin-TLF/medium/tlit
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/scit
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{sc}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{scit}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
}{}
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{sl}{
+ <-> ssub * Cabin-TLF/condensed/sl
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{scsl}{
+ <-> ssub * Cabin-TLF/condensed/scsl
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{sc}{
+ <-> ssub * Cabin-TLF/condensed/sc
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{n}{
+ <-> ssub * Cabin-TLF/condensed/n
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{it}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{c}{scit}{
+ <-> ssub * Cabin-TLF/condensed/scit
+}{}
+
+
% m --> regular
-\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{
- <-> ssub * Cabin-TLF/regular/scsl
+\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{
+ <-> ssub * Cabin-TLF/regular/sl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{m}{tl}{
- <-> ssub * Cabin-TLF/regular/tl
+\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{
+ <-> ssub * Cabin-TLF/regular/scsl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{m}{sc}{
@@ -193,31 +280,46 @@
<-> ssub * Cabin-TLF/regular/it
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{m}{sl}{
- <-> ssub * Cabin-TLF/regular/sl
+\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{
+ <-> ssub * Cabin-TLF/regular/scit
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{m}{tlsl}{
- <-> ssub * Cabin-TLF/regular/tlsl
+
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{m}{scit}{
- <-> ssub * Cabin-TLF/regular/scit
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{scsl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scsl
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{sc}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sc
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{n}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/n
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{m}{tlit}{
- <-> ssub * Cabin-TLF/regular/tlit
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{it}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{sbc}{scit}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/scit
}{}
% sb --> semibold
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{
- <-> ssub * Cabin-TLF/semibold/scsl
+\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{
+ <-> ssub * Cabin-TLF/semibold/sl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{tl}{
- <-> ssub * Cabin-TLF/semibold/tl
+\DeclareFontShape{T1}{Cabin-TLF}{sb}{scsl}{
+ <-> ssub * Cabin-TLF/semibold/scsl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{sb}{sc}{
@@ -232,31 +334,46 @@
<-> ssub * Cabin-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{sl}{
- <-> ssub * Cabin-TLF/semibold/sl
+\DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{
+ <-> ssub * Cabin-TLF/semibold/scit
+}{}
+
+
+% bc --> boldcondensed
+
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/sl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlsl}{
- <-> ssub * Cabin-TLF/semibold/tlsl
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{scsl}{
+ <-> ssub * Cabin-TLF/boldcondensed/scsl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{scit}{
- <-> ssub * Cabin-TLF/semibold/scit
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{sc}{
+ <-> ssub * Cabin-TLF/boldcondensed/sc
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{sb}{tlit}{
- <-> ssub * Cabin-TLF/semibold/tlit
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{n}{
+ <-> ssub * Cabin-TLF/boldcondensed/n
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{it}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{bc}{scit}{
+ <-> ssub * Cabin-TLF/boldcondensed/scit
}{}
% b --> bold
-\DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{
- <-> ssub * Cabin-TLF/bold/scsl
+\DeclareFontShape{T1}{Cabin-TLF}{b}{sl}{
+ <-> ssub * Cabin-TLF/bold/sl
}{}
-\DeclareFontShape{T1}{Cabin-TLF}{b}{tl}{
- <-> ssub * Cabin-TLF/bold/tl
+\DeclareFontShape{T1}{Cabin-TLF}{b}{scsl}{
+ <-> ssub * Cabin-TLF/bold/scsl
}{}
\DeclareFontShape{T1}{Cabin-TLF}{b}{sc}{
@@ -271,22 +388,10 @@
<-> 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
}{}
@@ -295,28 +400,16 @@
<-> 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
-}{}
-
\DeclareFontShape{T1}{Cabin-TLF}{bx}{sl}{
<-> 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
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{it}{
+ <-> ssub * Cabin-TLF/b/it
}{}
\DeclareFontShape{T1}{Cabin-TLF}{bx}{scit}{
diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd
deleted file mode 100644
index 0c1bd9e2754..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-Sup.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{T1CabinCondensed-Sup.fd}
- [2019/04/04 (autoinst) Font definitions for T1/CabinCondensed-Sup.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{CabinCondensed-Sup}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{regular}{sl}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{semibold}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/it
-}{}
-
-
-% ---- 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}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-sup-t1
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{m}{it}{
- <-> ssub * CabinCondensed-Sup/regular/it
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{T1}{CabinCondensed-Sup}{sb}{sl}{
- <-> ssub * CabinCondensed-Sup/semibold/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
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd
deleted file mode 100644
index 2afb49f2c4f..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd
+++ /dev/null
@@ -1,326 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{T1CabinCondensed-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for T1/CabinCondensed-TLF.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{CabinCondensed-TLF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{scsl}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{sl}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{regular}{tlsl}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scit
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{semibold}{sl}{
- <-> ssub * CabinCondensed-TLF/semibold/it
-}{}
-
-\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
-}{}
-
-
-% ---- medium ----
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{tl}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{sc}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{tlit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-titling-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{scit}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{scsl}{
- <-> ssub * CabinCondensed-TLF/medium/scit
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{medium}{sl}{
- <-> ssub * CabinCondensed-TLF/medium/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/tl
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{
- <-> ssub * CabinCondensed-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{n}{
- <-> ssub * CabinCondensed-TLF/regular/n
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/scit
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{tlit}{
- <-> ssub * CabinCondensed-TLF/regular/tlit
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scsl}{
- <-> ssub * CabinCondensed-TLF/semibold/scsl
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{tl}{
- <-> ssub * CabinCondensed-TLF/semibold/tl
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sc}{
- <-> ssub * CabinCondensed-TLF/semibold/sc
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{n}{
- <-> ssub * CabinCondensed-TLF/semibold/n
-}{}
-
-\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
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sl}{
- <-> 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
-}{}
-
-\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scit}{
- <-> ssub * CabinCondensed-TLF/b/scit
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
index 15d74d8f030..e83d995212f 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 2019/04/04
+%% Generated by autoinst on 2019/04/24
%%
\ProvidesFile{TS1Cabin-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/Cabin-TLF.]
+ [2019/04/24 (autoinst) Font definitions for TS1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -57,6 +57,36 @@
}{}
+% ---- boldcondensed ----
+
+\DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{boldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+
+% ---- condensed ----
+
+\DeclareFontShape{TS1}{Cabin-TLF}{condensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{condensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{condensed}{sl}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+
% ---- medium ----
\DeclareFontShape{TS1}{Cabin-TLF}{medium}{n}{
@@ -71,10 +101,55 @@
<-> ssub * Cabin-TLF/medium/it
}{}
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-Medium-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-MediumItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Cabin-TLF/mediumcondensed/it
+}{}
+
+
+% ---- semiboldcondensed ----
+
+\DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{n}{
+ <-> \Cabin@@scale CabinCondensed-SemiBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{it}{
+ <-> \Cabin@@scale CabinCondensed-SemiBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{semiboldcondensed}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
+}{}
+
%
-% ==== Extra 'ssub' rules to map the standard NFSS codes to our fancy names ====
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
%
+% c --> condensed
+
+\DeclareFontShape{TS1}{Cabin-TLF}{c}{sl}{
+ <-> ssub * Cabin-TLF/condensed/sl
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{c}{n}{
+ <-> ssub * Cabin-TLF/condensed/n
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{c}{it}{
+ <-> ssub * Cabin-TLF/condensed/it
+}{}
+
+
% m --> regular
\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{
@@ -90,6 +165,21 @@
}{}
+% sbc --> semiboldcondensed
+
+\DeclareFontShape{TS1}{Cabin-TLF}{sbc}{sl}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/sl
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{sbc}{n}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/n
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{sbc}{it}{
+ <-> ssub * Cabin-TLF/semiboldcondensed/it
+}{}
+
+
% sb --> semibold
\DeclareFontShape{TS1}{Cabin-TLF}{sb}{sl}{
@@ -105,6 +195,21 @@
}{}
+% bc --> boldcondensed
+
+\DeclareFontShape{TS1}{Cabin-TLF}{bc}{sl}{
+ <-> ssub * Cabin-TLF/boldcondensed/sl
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{bc}{n}{
+ <-> ssub * Cabin-TLF/boldcondensed/n
+}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{bc}{it}{
+ <-> ssub * Cabin-TLF/boldcondensed/it
+}{}
+
+
% b --> bold
\DeclareFontShape{TS1}{Cabin-TLF}{b}{sl}{
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd
deleted file mode 100644
index f99d45e20fa..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd
+++ /dev/null
@@ -1,134 +0,0 @@
-%% Generated by autoinst on 2019/04/04
-%%
-\ProvidesFile{TS1CabinCondensed-TLF.fd}
- [2019/04/04 (autoinst) Font definitions for TS1/CabinCondensed-TLF.]
-
-\expandafter\ifx\csname CabinCondensed@scale\endcsname\relax
- \let\CabinCondensed@@scale\@empty
-\else
- \edef\CabinCondensed@@scale{s*[\csname CabinCondensed@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{TS1}{CabinCondensed-TLF}{}
-
-
-% ---- regular ----
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-Italic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{regular}{sl}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-
-% ---- semibold ----
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{n}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{semibold}{sl}{
- <-> ssub * CabinCondensed-TLF/semibold/it
-}{}
-
-
-% ---- 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}{medium}{it}{
- <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ts1
-}{}
-
-\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}{
- <-> ssub * CabinCondensed-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{
- <-> ssub * CabinCondensed-TLF/regular/it
-}{}
-
-
-% sb --> semibold
-
-\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{sl}{
- <-> ssub * CabinCondensed-TLF/semibold/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
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index 1910e4445dd..72642b0534e 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}
- [2019/04/04 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2019/04/24 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -21,9 +21,8 @@
\newif\ifcabin@condensed \cabin@condensedfalse
\newcommand*{\Cabin@scale}{1}
-\newcommand*{\CabinCondensed@scale}{1}
-\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}}
\DeclareOptionX{default}{\cabin@defaulttrue}
\DeclareOptionX{sfdefault}{\cabin@defaulttrue}
@@ -45,10 +44,17 @@
\else % type1
- \def\bfseries@sf{bold}
- \ifcabin@semibold\def\bfseries@sf{semibold}\fi
- \def\mdseries@sf{regular}
- \ifcabin@medium\def\mdseries@sf{medium}\fi
+ \ifcabin@condensed
+ \def\bfseries@sf{boldcondensed}
+ \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi
+ \def\mdseries@sf{condensed}
+ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
+ \else
+ \def\bfseries@sf{bold}
+ \ifcabin@semibold\def\bfseries@sf{semibold}\fi
+ \def\mdseries@sf{regular}
+ \ifcabin@medium\def\mdseries@sf{medium}\fi
+ \fi
\fi
\ifcabin@otf
@@ -96,11 +102,14 @@
{CabinCondensed}
\else % type1
\def\cabinfamily{Cabin-TLF}
- \def\cabincondensedfamily{CabinCondensed-TLF}
\newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont}
- \newcommand*\cabincondensed{\fontfamily{\cabincondensedfamily}\selectfont}
+ \newcommand*\cabincondensed{%
+ \def\bfseries@sf{boldcondensed}
+ \ifcabin@semibold\def\bfseries@sf{semiboldcondensed}\fi
+ \def\mdseries@sf{condensed}
+ \ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
+ }
\def\sfdefault{\cabinfamily}
- \ifcabin@condensed\def\sfdefault{\cabincondensedfamily}\fi
\ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
\fi