summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-25 23:21:05 +0000
committerKarl Berry <karl@freefriends.org>2012-11-25 23:21:05 +0000
commit2dffbf93287b0c6bc59f27a94a4157d45a444fab (patch)
tree07b460f120d82a0fc192f583908b08e66eca4cb4 /Master/texmf-dist/tex/latex
parentbc5931a3697f65ac76c60561614e32a9fc18b6e4 (diff)
cabin (25nov12)
git-svn-id: svn://tug.org/texlive/trunk@28359 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd12
-rw-r--r--Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd12
-rw-r--r--Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd12
-rw-r--r--Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd110
-rw-r--r--Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd9
-rw-r--r--Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd63
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty115
9 files changed, 516 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
index ced55cae600..ccb05686833 100644
--- a/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/LY1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2012/10/31
+%% Generated by autoinst on 2012/11/17
%%
\ProvidesFile{LY1Cabin-TLF.fd}
- [2012/10/31 (autoinst) Font definitions for LY1/Cabin-TLF.]
+ [2012/11/17 (autoinst) Font definitions for LY1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -99,4 +99,12 @@
\DeclareFontShape{LY1}{Cabin-TLF}{m}{scsl}{
<-> ssub * Cabin-TLF/m/scit
}{}
+
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{}
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{}
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{}
+\DeclareFontShape{LY1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd
new file mode 100644
index 00000000000..a11bf7cc5d8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cabin/LY1CabinCondensed-TLF.fd
@@ -0,0 +1,110 @@
+%% Generated by autoinst on 2012/11/17
+%%
+\ProvidesFile{LY1CabinCondensed-TLF.fd}
+ [2012/11/17 (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}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{sl}{
+ <-> ssub * CabinCondensed-TLF/b/it
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{b}{scsl}{
+ <-> ssub * CabinCondensed-TLF/b/scit
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{sl}{
+ <-> ssub * CabinCondensed-TLF/sb/it
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{sb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/sb/scit
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{sl}{
+ <-> ssub * CabinCondensed-TLF/mb/it
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{mb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/mb/scit
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{sl}{
+ <-> ssub * CabinCondensed-TLF/m/it
+}{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{m}{scsl}{
+ <-> ssub * CabinCondensed-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{}
+\DeclareFontShape{LY1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
index dcdb5bdfe0b..17a206b343b 100644
--- a/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/OT1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2012/10/31
+%% Generated by autoinst on 2012/11/17
%%
\ProvidesFile{OT1Cabin-TLF.fd}
- [2012/10/31 (autoinst) Font definitions for OT1/Cabin-TLF.]
+ [2012/11/17 (autoinst) Font definitions for OT1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -99,4 +99,12 @@
\DeclareFontShape{OT1}{Cabin-TLF}{m}{scsl}{
<-> ssub * Cabin-TLF/m/scit
}{}
+
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{}
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{}
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{}
+\DeclareFontShape{OT1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd
new file mode 100644
index 00000000000..64301a8bc42
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cabin/OT1CabinCondensed-TLF.fd
@@ -0,0 +1,110 @@
+%% Generated by autoinst on 2012/11/17
+%%
+\ProvidesFile{OT1CabinCondensed-TLF.fd}
+ [2012/11/17 (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}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{sl}{
+ <-> ssub * CabinCondensed-TLF/b/it
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{b}{scsl}{
+ <-> ssub * CabinCondensed-TLF/b/scit
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{sl}{
+ <-> ssub * CabinCondensed-TLF/sb/it
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{sb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/sb/scit
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{sl}{
+ <-> ssub * CabinCondensed-TLF/mb/it
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{mb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/mb/scit
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{sl}{
+ <-> ssub * CabinCondensed-TLF/m/it
+}{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{m}{scsl}{
+ <-> ssub * CabinCondensed-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{}
+\DeclareFontShape{OT1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
index a3e9f87b8c2..6b2af0a1205 100644
--- a/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/T1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2012/10/31
+%% Generated by autoinst on 2012/11/17
%%
\ProvidesFile{T1Cabin-TLF.fd}
- [2012/10/31 (autoinst) Font definitions for T1/Cabin-TLF.]
+ [2012/11/17 (autoinst) Font definitions for T1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -99,4 +99,12 @@
\DeclareFontShape{T1}{Cabin-TLF}{m}{scsl}{
<-> ssub * Cabin-TLF/m/scit
}{}
+
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{}
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{n}{ <-> ssub * Cabin-TLF/b/n }{}
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{scit}{ <-> ssub * Cabin-TLF/b/scit }{}
+\DeclareFontShape{T1}{Cabin-TLF}{bx}{scsl}{ <-> ssub * Cabin-TLF/b/scsl }{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd
new file mode 100644
index 00000000000..cd2bf5c5ddb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cabin/T1CabinCondensed-TLF.fd
@@ -0,0 +1,110 @@
+%% Generated by autoinst on 2012/11/17
+%%
+\ProvidesFile{T1CabinCondensed-TLF.fd}
+ [2012/11/17 (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}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{sl}{
+ <-> ssub * CabinCondensed-TLF/b/it
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{b}{scsl}{
+ <-> ssub * CabinCondensed-TLF/b/scit
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{sl}{
+ <-> ssub * CabinCondensed-TLF/sb/it
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{sb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/sb/scit
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{sl}{
+ <-> ssub * CabinCondensed-TLF/mb/it
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{mb}{scsl}{
+ <-> ssub * CabinCondensed-TLF/mb/scit
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sc}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{sl}{
+ <-> ssub * CabinCondensed-TLF/m/it
+}{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scit}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{m}{scsl}{
+ <-> ssub * CabinCondensed-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sc}{ <-> ssub * CabinCondensed-TLF/b/sc }{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scit}{ <-> ssub * CabinCondensed-TLF/b/scit }{}
+\DeclareFontShape{T1}{CabinCondensed-TLF}{bx}{scsl}{ <-> ssub * CabinCondensed-TLF/b/scsl }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
index 5d8d65c7a39..a6f4ff33673 100644
--- a/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
+++ b/Master/texmf-dist/tex/latex/cabin/TS1Cabin-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2012/10/31
+%% Generated by autoinst on 2012/11/17
%%
\ProvidesFile{TS1Cabin-TLF.fd}
- [2012/10/31 (autoinst) Font definitions for TS1/Cabin-TLF.]
+ [2012/11/17 (autoinst) Font definitions for TS1/Cabin-TLF.]
\expandafter\ifx\csname Cabin@scale\endcsname\relax
\let\Cabin@@scale\@empty
@@ -55,4 +55,9 @@
\DeclareFontShape{TS1}{Cabin-TLF}{m}{sl}{
<-> ssub * Cabin-TLF/m/it
}{}
+
+\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sc}{ <-> ssub * Cabin-TLF/b/sc }{}
+\DeclareFontShape{TS1}{Cabin-TLF}{bx}{it}{ <-> ssub * Cabin-TLF/b/it }{}
+\DeclareFontShape{TS1}{Cabin-TLF}{bx}{sl}{ <-> ssub * Cabin-TLF/b/it }{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd
new file mode 100644
index 00000000000..af834b21689
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cabin/TS1CabinCondensed-TLF.fd
@@ -0,0 +1,63 @@
+%% Generated by autoinst on 2012/11/17
+%%
+\ProvidesFile{TS1CabinCondensed-TLF.fd}
+ [2012/11/17 (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}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{b}{sl}{
+ <-> ssub * CabinCondensed-TLF/b/it
+}{}
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-SemiBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{sb}{sl}{
+ <-> ssub * CabinCondensed-TLF/sb/it
+}{}
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Medium-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-MediumItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{mb}{sl}{
+ <-> ssub * CabinCondensed-TLF/mb/it
+}{}
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{n}{
+ <-> \CabinCondensed@@scale CabinCondensed-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{it}{
+ <-> \CabinCondensed@@scale CabinCondensed-RegularItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{m}{sl}{
+ <-> ssub * CabinCondensed-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{n}{ <-> ssub * CabinCondensed-TLF/b/n }{}
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{it}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+\DeclareFontShape{TS1}{CabinCondensed-TLF}{bx}{sl}{ <-> ssub * CabinCondensed-TLF/b/it }{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index d410355e915..da09666df22 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -1,42 +1,72 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2012/11/09 (Bob Tennent and autoinst) Style file for Cabin.]
+ [2012/11/13 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
\newif\ifcabin@otf
\ifxetex
- \RequirePackage{fontspec}
\cabin@otftrue
\else\ifluatex
- \RequirePackage{fontspec}
\cabin@otftrue
\else % [pdf]LaTeX
- \RequirePackage{fontenc,fontaxes}
\cabin@otffalse
\fi\fi
+\newif\ifcabin@default \cabin@defaultfalse
+\newif\ifcabin@lining \cabin@liningfalse
+\newif\ifcabin@tabular \cabin@tabularfalse
+\newif\ifcabin@semibold \cabin@semiboldfalse
+\newif\ifcabin@medium \cabin@mediumfalse
+\newif\ifcabin@condensed \cabin@condensedfalse
+
\newcommand*{\Cabin@scale}{1}
-\RequirePackage{xkeyval}
\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}}
\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}}
-\newif\ifcabin@default \cabin@defaultfalse
+\DeclareOptionX{default}{\cabin@defaulttrue}
\DeclareOptionX{sfdefault}{\cabin@defaulttrue}
+\DeclareOptionX{type1}{\cabin@otffalse}
+\DeclareOptionX{semibold}{\cabin@semiboldtrue}
+\DeclareOptionX{bold}{\cabin@semiboldfalse}
+\DeclareOptionX{medium}{\cabin@mediumtrue}
+\DeclareOptionX{regular}{\cabin@mediumfalse}
+\DeclareOptionX{condensed}{\cabin@condensedtrue}
+
+\ExecuteOptionsX{bold,regular}
+\ProcessOptionsX\relax
\ifcabin@otf
- \DeclareOptionX{semibold}{\edef\cabin@boldstyle{SemiBold}}
- \DeclareOptionX{bold}{\edef\cabin@boldstyle{Bold}}
- \DeclareOptionX{medium}{\edef\cabin@regstyle{Medium}}
- \DeclareOptionX{regular}{\edef\cabin@regstyle{Regular}}
+ \ifcabin@semibold
+ \edef\cabin@boldstyle{SemiBold}
+ \else
+ \edef\cabin@boldstyle{Bold}
+ \fi
+ \ifcabin@medium
+ \edef\cabin@regstyle{Medium}
+ \else
+ \edef\cabin@regstyle{Regular}
+ \fi
+
\else % type1
- \DeclareOptionX{semibold}{\renewcommand*{\bfdefault}{sb}}
- \DeclareOptionX{bold}{\renewcommand*{\bfdefault}{b}}
- \DeclareOptionX{medium}{\renewcommand*{\mddefault}{mb}}
- \DeclareOptionX{regular}{\renewcommand*{\mddefault}{m}}
+
+ \ifcabin@semibold
+ \renewcommand*{\bfdefault}{sb}
+ \else
+ \renewcommand*{\bfdefault}{b}
+ \fi
+ \ifcabin@medium
+ \renewcommand*{\mddefault}{mb}
+ \else
+ \renewcommand*{\mddefault}{m}
+ \fi
+\fi
+
+\ifcabin@otf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes}
\fi
-\ExecuteOptionsX{bold,regular}
-\ProcessOptionsX\relax
\ifcabin@otf
\ifxetex\XeTeXtracingfonts=1\fi
@@ -44,26 +74,53 @@
Ligatures = TeX ,
Scale = \Cabin@scale ,
Extension = .otf }
- \setsansfont
- [ UprightFont = *-\cabin@regstyle ,
- ItalicFont = *-\cabin@regstyle Italic ,
- BoldFont = *-\cabin@boldstyle ,
- BoldItalicFont = *-\cabin@boldstyle Italic ]
- {Cabin}
- \ifcabin@default
- \setmainfont
+ \ifcabin@condensed
+ \setsansfont
+ [ UprightFont = *-\cabin@regstyle ,
+ ItalicFont = *-\cabin@regstyle Italic ,
+ BoldFont = *-\cabin@boldstyle ,
+ BoldItalicFont = *-\cabin@boldstyle Italic ]
+ {CabinCondensed}
+ \else
+ \setsansfont
[ UprightFont = *-\cabin@regstyle ,
ItalicFont = *-\cabin@regstyle Italic ,
BoldFont = *-\cabin@boldstyle ,
BoldItalicFont = *-\cabin@boldstyle Italic ]
{Cabin}
\fi
+ % grab current family in case of subsequent change:
+ \let\cabinfamily\sfdefault
+ \ifcabin@default\renewcommand*\familydefault{\cabinfamily}\fi
+ \newfontfamily\cabin
+ [ UprightFont = *-\cabin@regstyle ,
+ ItalicFont = *-\cabin@regstyle Italic ,
+ BoldFont = *-\cabin@boldstyle ,
+ BoldItalicFont = *-\cabin@boldstyle Italic ]
+ {Cabin}
+ \newfontfamily\cabincondensed
+ [ UprightFont = *-\cabin@regstyle ,
+ ItalicFont = *-\cabin@regstyle Italic ,
+ BoldFont = *-\cabin@boldstyle ,
+ BoldItalicFont = *-\cabin@boldstyle Italic ]
+ {CabinCondensed}
\else % type1
- \renewcommand*\sfdefault{Cabin-TLF}
- \ifcabin@default
- \renewcommand*\familydefault{Cabin-TLF}
- \fi
+ \def\cabinfamily{Cabin-TLF}
+ \def\cabincondensedfamily{CabinCondensed-TLF}
+ \ifcabin@condensed
+ \renewcommand*\sfdefault{\cabincondensedfamily}
+ \ifcabin@default\renewcommand*\familydefault{\cabincondensedfamily}\fi
+ \else
+ \renewcommand*\sfdefault{\cabinfamily}
+ \ifcabin@default\renewcommand*\familydefault{\cabinfamily}\fi
+ \fi
+ \newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont}
+ \newcommand*\cabincondensed{\fontfamily{\cabincondensedfamily}\selectfont}
\fi
+% turn off defaults in case other fonts are selected:
+\ifcabin@otf
+ \defaultfontfeatures{}
+\fi
\endinput