summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-12-25 21:19:50 +0000
committerKarl Berry <karl@freefriends.org>2022-12-25 21:19:50 +0000
commite3e3482490502bea35ff2b1372140e5db47809f8 (patch)
tree32bc8a315d819ec5c78a7dd7714f28074ba930b8
parent6f630003fb5786cf7cd7c9357181f48c5b5ca5aa (diff)
cabin (25dec22)
git-svn-id: svn://tug.org/texlive/trunk@65358 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cabin/README2
-rw-r--r--Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdfbin227226 -> 227228 bytes
-rw-r--r--Master/texmf-dist/tex/latex/cabin/cabin.sty20
3 files changed, 13 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/fonts/cabin/README b/Master/texmf-dist/doc/fonts/cabin/README
index f3f9e2ba54e..cc4a6f05797 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 2022-09-13.
+This is the README for the cabin package, version 2022-12-24.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Cabin and Cabin Condensed families of sans serif fonts, designed by
diff --git a/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf
index 04301451043..c0536475f70 100644
--- a/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cabin/cabin-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/cabin/cabin.sty b/Master/texmf-dist/tex/latex/cabin/cabin.sty
index e702fa19296..209f5b8f634 100644
--- a/Master/texmf-dist/tex/latex/cabin/cabin.sty
+++ b/Master/texmf-dist/tex/latex/cabin/cabin.sty
@@ -1,9 +1,10 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cabin}
- [2022/09/13 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
+ [2022/12/24 (Bob Tennent) Supports Cabin fonts for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
+
\newif\ifcabin@otf
\ifxetex
\cabin@otftrue
@@ -13,6 +14,12 @@
\cabin@otffalse
\fi\fi
+\ifcabin@otf
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
\newif\ifcabin@default \cabin@defaultfalse
\newif\ifcabin@lining \cabin@liningfalse
\newif\ifcabin@tabular \cabin@tabularfalse
@@ -59,11 +66,7 @@
\fi
\fi
-\ifcabin@otf
- \RequirePackage{fontspec}
-\else
- \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+
\ifcabin@otf
\defaultfontfeatures{
@@ -112,8 +115,9 @@
\ifcabin@medium\def\mdseries@sf{mediumcondensed}\fi
\mdseries
}
- \def\sfdefault{\cabinfamily}
- \ifcabin@default\edef\familydefault{\sfdefault}\edef\seriesdefault{\mdseries@sf}\fi
+ \edef\sfdefault{\cabinfamily}
+ \ifcabin@default\edef\familydefault{\cabinfamily}\edef\seriesdefault{\mdseries@sf}\fi
+
\fi
\ifcabin@otf