cabin (9nov12)

git-svn-id: svn://tug.org/texlive/trunk@28219 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 73 insertions, 117 deletions

diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README
index f774f54e9db..3ed3214715c 100644
--- a/Master/texmf-dist/doc/fonts/cabin/README
+++ b/Master/texmf-dist/doc/fonts/cabin/README
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2012-11-02.
+This is the README for the cabin package, version 2012-11-09.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Cabin family of sans serif fonts, designed by Pablo Impallari.
@@ -19,7 +19,12 @@ To use, add
 
 \usepackage{cabin}
 
-to the preamble of your document. Options include:
+to the preamble of your document. To set Cabin as the main text font,
+use
+
+\usepackage[sfdefault]{cabin}
+
+Other options include:
 
 bold            \bfdefault is bold
 semibold        \bfdefault is semibold
@@ -27,7 +32,7 @@ semibold        \bfdefault is semibold
 regular         \mddefault is regular
 medium          \mddefault is medium
 
-Defaults are regular and bold.
+Defaults are regular and bold. 
 
 Available shapes in all series include:
 
@@ -35,11 +40,12 @@ it              italic
 sc              small caps
 scit            italic small caps
 
-Font encodings supported are OT1, T1, LY1 and TS1.
-If the xkeyval package is installed, a scaled=... option may be used.
+Options scaled=<number> or scale=<number> may be used to adjust
+fontsizes to match a serifed font.
+
 Slanted variants are not supported; the designed italic variants will
 be automatically substituted. The only figure style supported is
-tabular-lining.
+tabular-lining. Font encodings supported are OT1, T1, LY1 and TS1.
 
 The original fonts are available at http://www.google.com/webfonts and
 are licensed under the SIL Open Font License, (version 1.1); the text
@@ -48,4 +54,4 @@ created using fontforge. The support files were created using autoinst
 and are licensed under the terms of the LaTeX Project Public License.
 The maintainer of this package is Bob Tennent (rdt at cs.queensu.ca)
 
-2012-11-02
+2012-11-09
diff --git a/Master/texmf-dist/doc/fonts/cabin/samples.pdf b/Master/texmf-dist/doc/fonts/cabin/samples.pdf
index 0981e948c6b..36aba37bb47 100644
--- a/Master/texmf-dist/doc/fonts/cabin/samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cabin/samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/cabin/samples.tex b/Master/texmf-dist/doc/fonts/cabin/samples.tex
index 9d13a4fd642..43201c63c34 100644
--- a/Master/texmf-dist/doc/fonts/cabin/samples.tex
+++ b/Master/texmf-dist/doc/fonts/cabin/samples.tex
@@ -1,7 +1,6 @@
 \documentclass{article}
-\usepackage[semibold,scaled=0.93]{cabin}
+\usepackage[default,semibold,scaled=0.93]{cabin}
 \usepackage{lipsum}
-\renewcommand{\familydefault}{\sfdefault}
 \begin{document}
 
 \section*{Regular}
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