summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cabin
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-10 00:45:51 +0000
committerKarl Berry <karl@freefriends.org>2012-11-10 00:45:51 +0000
commit78bae8818103929156bae85cd1bf5eb95dc106e9 (patch)
tree4aced238bc6ed25447523f93cd57884769a6fdb0 /Master/texmf-dist/tex/latex/cabin
parentb4ac4cd31b7c61c5b5078b231821036a06a1af7b (diff)
cabin (9nov12)
git-svn-id: svn://tug.org/texlive/trunk@28219 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cabin')
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin-otf.sty54
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin-type1.sty41
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty72
3 files changed, 59 insertions, 108 deletions
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin-otf.sty b/Master/texmf-dist/tex/latex/cabin/cabin-otf.sty
deleted file mode 100644
index 1d6a2fe8009..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/cabin-otf.sty
+++ /dev/null
@@ -1,54 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cabin-otf}
- [2012/10/31 (autoinst) Style file for Cabin when using LuaLaTeX or XeLatex.]
-\RequirePackage{ifxetex,ifluatex}
-\ifxetex
- % okay
- \XeTeXtracingfonts=1\relax
-\else
- \ifluatex
- % okay
- \else
- \PackageError{cabin-otf}{runs only with xelatex and lualatex!}{}
- \fi
-\fi
-
-
-\RequirePackage{textcomp}
-\IfFileExists{fontaxes.sty}{
- \RequirePackage{fontaxes}
-}{}
-
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\Cabin@scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
-
-
-\DeclareOptionX{semibold}{\edef\Cabin@boldstyle{SemiBold}}
-\DeclareOptionX{bold}{\edef\Cabin@boldstyle{Bold}}
-\DeclareOptionX{medium}{\edef\Cabin@regstyle{Medium}}
-\DeclareOptionX{regular}{\edef\Cabin@regstyle{Regular}}
-\ExecuteOptionsX{bold,regular}
-\ProcessOptionsX\relax
-
-\RequirePackage{fontspec}
-\defaultfontfeatures{
- Ligatures = TeX ,
- Scale = \Cabin@scale ,
- Extension = .otf }
-
-% Default font
-\setsansfont
- [ UprightFont = *-\Cabin@regstyle ,
- ItalicFont = *-\Cabin@regstyle Italic ,
- BoldFont = *-\Cabin@boldstyle ,
- BoldItalicFont = *-\Cabin@boldstyle Italic ]
- {Cabin}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin-type1.sty b/Master/texmf-dist/tex/latex/cabin/cabin-type1.sty
deleted file mode 100644
index ae192b87ee3..00000000000
--- a/Master/texmf-dist/tex/latex/cabin/cabin-type1.sty
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Generated by autoinst on 2012/10/31
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cabin-type1}
- [2012/10/31 (autoinst) Style file for Cabin when using LaTeX or pdfLaTeX.]
-\ifxetex
- \PackageError{cabin-type1}{runs only with latex and pdflatex!}{}
-\else\ifluatex
- \PackageError{cabin-type1}{runs only with latex and pdflatex!}{}
-\else
- % okay
-\fi\fi
-
-\RequirePackage{textcomp}
-\IfFileExists{fontaxes.sty}{
- \RequirePackage{fontaxes}
-}{}
-
-\IfFileExists{xkeyval.sty}{
- \newcommand*{\Cabin@scale}{1}
- \RequirePackage{xkeyval}
- \DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{##1}}
-}{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
-
-\edef\Cabin@figurestyle{LF}
-\edef\Cabin@figurealign{T}
-\DeclareOptionX{semibold}{\renewcommand*{\bfdefault}{sb}}
-\DeclareOptionX{bold}{\renewcommand*{\bfdefault}{b}}
-\DeclareOptionX{medium}{\renewcommand*{\mddefault}{mb}}
-\DeclareOptionX{regular}{\renewcommand*{\mddefault}{m}}
-\ExecuteOptionsX{bold,regular}
-\ProcessOptionsX\relax
-\renewcommand*
- {\sfdefault}
- {Cabin-\Cabin@figurealign\Cabin@figurestyle}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index 9d471851e6c..d410355e915 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -1,23 +1,69 @@
-%% Generated by autoinst on 2012/10/31
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2012/10/31 (autoinst) Style file for Cabin.]
+ [2012/11/09 (Bob Tennent and autoinst) Style file for Cabin.]
-\RequirePackage{ifxetex,ifluatex}
+\RequirePackage{ifxetex,ifluatex,textcomp}
+
+\newif\ifcabin@otf
\ifxetex
- \edef\Cabin@pack{otf}
+ \RequirePackage{fontspec}
+ \cabin@otftrue
\else\ifluatex
- \edef\Cabin@pack{otf}
+ \RequirePackage{fontspec}
+ \cabin@otftrue
\else % [pdf]LaTeX
- \edef\Cabin@pack{type1}
+ \RequirePackage{fontenc,fontaxes}
+ \cabin@otffalse
\fi\fi
-\DeclareOption*{
- \PassOptionsToPackage{\CurrentOption}{cabin-\Cabin@pack}%
-}
-\ProcessOptions\relax
-
-\RequirePackage{cabin-\Cabin@pack}
+\newcommand*{\Cabin@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}}
+
+\newif\ifcabin@default \cabin@defaultfalse
+\DeclareOptionX{sfdefault}{\cabin@defaulttrue}
+
+\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}}
+\else % type1
+ \DeclareOptionX{semibold}{\renewcommand*{\bfdefault}{sb}}
+ \DeclareOptionX{bold}{\renewcommand*{\bfdefault}{b}}
+ \DeclareOptionX{medium}{\renewcommand*{\mddefault}{mb}}
+ \DeclareOptionX{regular}{\renewcommand*{\mddefault}{m}}
+\fi
+\ExecuteOptionsX{bold,regular}
+\ProcessOptionsX\relax
+
+\ifcabin@otf
+ \ifxetex\XeTeXtracingfonts=1\fi
+ \defaultfontfeatures{
+ 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
+ [ UprightFont = *-\cabin@regstyle ,
+ ItalicFont = *-\cabin@regstyle Italic ,
+ BoldFont = *-\cabin@boldstyle ,
+ BoldItalicFont = *-\cabin@boldstyle Italic ]
+ {Cabin}
+ \fi
+\else % type1
+ \renewcommand*\sfdefault{Cabin-TLF}
+ \ifcabin@default
+ \renewcommand*\familydefault{Cabin-TLF}
+ \fi
+\fi
+
\endinput