cabin (26feb16)

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

3 files changed, 11 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README
index 99d68a554eb..36c1cb08a1d 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-20.
+This is the README for the cabin package, version 2016-02-26.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Cabin and Cabin Condensed families of sans serif fonts, designed by 
@@ -11,11 +11,12 @@ incorporates modern proportions, optical adjustments, and some elements
 of the geometric sans. A compatible condensed family CabinCondensed is
 also available.
 
-To install this package on a TDS-compliant TeX system unzip the file
-tex-archive/install/fonts/cabin.tds.zip at the root of an appropriate
-texmf tree, likely a personal or local tree. If necessary, update
-the file-name database (e.g., texhash). Update the font-map files by
-enabling the Map file cabin.map.
+To install this package on a TDS-compliant TeX system download the
+file "tex-archive"/install/fonts/cabin.tds.zip, where the preferred
+URL for "tex-archive" is http://mirror.ctan.org. Unzip the archive
+at the root of an appropriate texmf tree, likely a personal or local
+tree. If necessary, update the file-name database (e.g., texhash).
+Update the font-map files by enabling the Map file cabin.map.
 
 To use, add
 
diff --git a/Master/texmf-dist/fonts/type1/impallari/cabin/Cabin-Regular.cff b/Master/texmf-dist/fonts/type1/impallari/cabin/Cabin-Regular.cff
new file mode 100644
index 00000000000..78493cae5e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/impallari/cabin/Cabin-Regular.cff
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index 33f88aca81c..7da0e9e59fb 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/20 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
+    [2016/02/26 (Bob Tennent)  Supports Cabin fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -21,8 +21,9 @@
 \newif\ifcabin@condensed \cabin@condensedfalse
 
 \newcommand*{\Cabin@scale}{1}
-\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}}
+\newcommand*{\CabinCondensed@scale}{1}  % corrections by Andreas Ahlrich 2016-02-26
+\DeclareOptionX{scaled}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\Cabin@scale}{#1}\renewcommand*{\CabinCondensed@scale}{#1}}
 
 \DeclareOptionX{default}{\cabin@defaulttrue}
 \DeclareOptionX{sfdefault}{\cabin@defaulttrue}