summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-22 22:05:12 +0000
committerKarl Berry <karl@freefriends.org>2013-07-22 22:05:12 +0000
commitd596187ceaaa238c02ae2006ee9be30e61772253 (patch)
treeb6f14bf16fae1c3e0d2582345a5a382cceb9ebc1
parentd8c45c205a8c3d026e4db8c8af520b856e430463 (diff)
cabin (22jul13)
git-svn-id: svn://tug.org/texlive/trunk@31265 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cabin/README12
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty48
2 files changed, 20 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README
index 8d68f02e976..99d68a554eb 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 2013-07-16.
+This is the README for the cabin package, version 2013-07-20.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Cabin and Cabin Condensed families of sans serif fonts, designed by
@@ -26,9 +26,8 @@ family. To also set Cabin as the main text font, use
\usepackage[sfdefault]{cabin}
-This re-defines \familydefault, not \rmdefault. LuaLaTeX and xeLaTeX
-users who might prefer type1 fonts or who wish to avoid fontspec may use
-the type1 option.
+LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
+to avoid fontspec may use the type1 option.
Other options include:
@@ -38,8 +37,9 @@ semibold
regular
medium
-These are now implemented by re-defining commands \bfseries and
-\mdseries (without re-defining \bfdefault or \mddefault).
+These are now implemented by defining macros recognized by commands
+defined in package mweights (without re-defining \bfdefault or
+\mddefault).
condensed
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index 20b6b23767d..33f88aca81c 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}
- [2013/07/16 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2013/07/20 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -37,35 +37,23 @@
\ProcessOptionsX\relax
\ifcabin@otf
- \ifcabin@semibold
- \edef\cabin@boldstyle{SemiBold}
- \else
- \edef\cabin@boldstyle{Bold}
- \fi
- \ifcabin@medium
- \edef\cabin@regstyle{Medium}
- \else
- \edef\cabin@regstyle{Regular}
- \fi
+ \def\cabin@boldstyle{Bold}
+ \ifcabin@semibold\def\cabin@boldstyle{SemiBold}\fi
+ \def\cabin@regstyle{Regular}
+ \ifcabin@medium\def\cabin@regstyle{Medium}\fi
\else % type1
- \ifcabin@semibold
- \edef\cabin@boldstyle{sb}
- \else
- \edef\cabin@boldstyle{b}
- \fi
- \ifcabin@medium
- \edef\cabin@regstyle{mb}
- \else
- \edef\cabin@regstyle{m}
- \fi
+ \def\bfseries@sf{b}
+ \ifcabin@semibold\def\bfseries@sf{sb}\fi
+ \def\mdseries@sf{m}
+ \ifcabin@medium\def\mdseries@sf{mb}\fi
\fi
\ifcabin@otf
\RequirePackage{fontspec}
\else
- \RequirePackage{fontenc,fontaxes}
+ \RequirePackage{fontenc,fontaxes,mweights}
\fi
\ifcabin@otf
@@ -107,23 +95,15 @@
\else % type1
\def\cabinfamily{Cabin-TLF}
\def\cabincondensedfamily{CabinCondensed-TLF}
- \ifcabin@condensed
- \renewcommand*\sfdefault{\cabincondensedfamily}
- \ifcabin@default\renewcommand*\familydefault{\cabincondensedfamily}\fi
- \else
- \renewcommand*\sfdefault{\cabinfamily}
- \let\mdseries@cabin\mdseries
- \renewcommand*\mdseries{\ifx\f@family\cabinfamily\fontseries\cabin@regstyle\selectfont\else\mdseries@cabin\fi}
- \let\bfseries@cabin\bfseries
- \renewcommand*\bfseries{\ifx\f@family\cabinfamily\fontseries\cabin@boldstyle\selectfont\else\bfseries@cabin\fi}
- \ifcabin@default\renewcommand*\familydefault{\cabinfamily}\fi
- \fi
\newcommand*\cabin{\fontfamily{\cabinfamily}\selectfont}
\newcommand*\cabincondensed{\fontfamily{\cabincondensedfamily}\selectfont}
+ \def\sfdefault{\cabinfamily}
+ \ifcabin@condensed\def\sfdefault{\cabincondensedfamily}\fi
+ \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
\fi
+\ifcabin@otf
% turn off defaults in case other fonts are selected:
-\ifcabin@otf
\defaultfontfeatures{}
\fi