summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cantarell
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-26 22:23:22 +0000
committerKarl Berry <karl@freefriends.org>2011-08-26 22:23:22 +0000
commit718cd7a964f6502a23e12933340cbb85ce82bbac (patch)
treea8e57b49266f2623dc436a91d956a8ee3e421979 /Master/texmf-dist/tex/latex/cantarell
parent27d845eb760ac861a99420a219473a50a5d4c98d (diff)
cantarell 2.0 (23aug11)
git-svn-id: svn://tug.org/texlive/trunk@23708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cantarell')
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/cantarell.sty7
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ot1fca.fd18
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t1fca.fd18
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ts1fca.fd18
4 files changed, 31 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
index 7662e1c16d6..96f9ecbdc91 100644
--- a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
+++ b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
@@ -14,16 +14,17 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cantarell}[2011/04/02 Cantarell]
+\ProvidesPackage{cantarell}[2011/07/24 Cantarell]
\RequirePackage{keyval}
\RequirePackage{slantsc}
+\RequirePackage[warn]{textcomp}
% Taken from inconsolata.sty
\define@key{cantarell}{scale}[1.0]{\def\cantarell@scale{s*[#1]}}
\DeclareOption*{%
- \begingroup
- \edef\x{\endgroup
+ \begingroup%
+ \edef\x{\endgroup%
\noexpand\setkeys{cantarell}{\CurrentOption}}%
\x%
}
diff --git a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
index a6620d4b1bd..5210df0ab40 100644
--- a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1fca.fd}
- [2011/04/06 Fontinst v1.927 font definitions for OT1/fca.]
+ [2011/08/21 Fontinst v1.927 font definitions for OT1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
@@ -14,35 +14,35 @@
\DeclareFontFamily{OT1}{fca}{}
\DeclareFontShape{OT1}{fca}{m}{n}{
- <->\cantarell@scale ot1-Cantarell-Regular
+ <->\cantarell@scale Cantarell-Regular-ot1
}{}
\DeclareFontShape{OT1}{fca}{m}{sl}{
- <->\cantarell@scale ot1-Cantarell-Regular-Slanted
+ <->\cantarell@scale Cantarell-Regular-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fca}{m}{sc}{
- <->\cantarell@scale ot1-Cantarell-Regular-SmallCaps
+ <->\cantarell@scale Cantarell-Regular-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fca}{m}{scsl}{
- <->\cantarell@scale ot1-Cantarell-Regular-Slanted-SmallCaps
+ <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fca}{b}{n}{
- <->\cantarell@scale ot1-Cantarell-Bold
+ <->\cantarell@scale Cantarell-Bold-ot1
}{}
\DeclareFontShape{OT1}{fca}{b}{sl}{
- <->\cantarell@scale ot1-Cantarell-Bold-Slanted
+ <->\cantarell@scale Cantarell-Bold-Slanted-ot1
}{}
\DeclareFontShape{OT1}{fca}{b}{sc}{
- <->\cantarell@scale ot1-Cantarell-Bold-SmallCaps
+ <->\cantarell@scale Cantarell-Bold-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fca}{b}{scsl}{
- <->\cantarell@scale ot1-Cantarell-Bold-Slanted-SmallCaps
+ <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-ot1
}{}
\DeclareFontShape{OT1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
index bf39cb4a0e6..eb6fc55ac9a 100644
--- a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1fca.fd}
- [2011/04/06 Fontinst v1.927 font definitions for T1/fca.]
+ [2011/08/21 Fontinst v1.927 font definitions for T1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
@@ -14,35 +14,35 @@
\DeclareFontFamily{T1}{fca}{}
\DeclareFontShape{T1}{fca}{m}{n}{
- <->\cantarell@scale t1-Cantarell-Regular
+ <->\cantarell@scale Cantarell-Regular-t1
}{}
\DeclareFontShape{T1}{fca}{m}{sl}{
- <->\cantarell@scale t1-Cantarell-Regular-Slanted
+ <->\cantarell@scale Cantarell-Regular-Slanted-t1
}{}
\DeclareFontShape{T1}{fca}{m}{sc}{
- <->\cantarell@scale t1-Cantarell-Regular-SmallCaps
+ <->\cantarell@scale Cantarell-Regular-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fca}{m}{scsl}{
- <->\cantarell@scale t1-Cantarell-Regular-Slanted-SmallCaps
+ <->\cantarell@scale Cantarell-Regular-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fca}{b}{n}{
- <->\cantarell@scale t1-Cantarell-Bold
+ <->\cantarell@scale Cantarell-Bold-t1
}{}
\DeclareFontShape{T1}{fca}{b}{sl}{
- <->\cantarell@scale t1-Cantarell-Bold-Slanted
+ <->\cantarell@scale Cantarell-Bold-Slanted-t1
}{}
\DeclareFontShape{T1}{fca}{b}{sc}{
- <->\cantarell@scale t1-Cantarell-Bold-SmallCaps
+ <->\cantarell@scale Cantarell-Bold-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fca}{b}{scsl}{
- <->\cantarell@scale t1-Cantarell-Bold-Slanted-SmallCaps
+ <->\cantarell@scale Cantarell-Bold-Slanted-SmallCaps-t1
}{}
\DeclareFontShape{T1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
index 460511c6fea..d66e06fbfc5 100644
--- a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
+++ b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1fca.fd}
- [2011/04/06 Fontinst v1.927 font definitions for TS1/fca.]
+ [2011/08/21 Fontinst v1.927 font definitions for TS1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
@@ -14,35 +14,35 @@
\DeclareFontFamily{TS1}{fca}{}
\DeclareFontShape{TS1}{fca}{m}{n}{
- <->\cantarell@scale ts1-Cantarell-Regular
+ <->\cantarell@scale Cantarell-Regular-ts1
}{}
\DeclareFontShape{TS1}{fca}{m}{sl}{
- <->\cantarell@scale ts1-Cantarell-Regular-Slanted
+ <->\cantarell@scale Cantarell-Regular-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fca}{m}{sc}{
- <->\cantarell@scale ts1-Cantarell-Regular
+ <->\cantarell@scale Cantarell-Regular-ts1
}{}
\DeclareFontShape{TS1}{fca}{m}{scsl}{
- <->\cantarell@scale ts1-Cantarell-Regular-Slanted
+ <->\cantarell@scale Cantarell-Regular-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fca}{b}{n}{
- <->\cantarell@scale ts1-Cantarell-Bold
+ <->\cantarell@scale Cantarell-Bold-ts1
}{}
\DeclareFontShape{TS1}{fca}{b}{sl}{
- <->\cantarell@scale ts1-Cantarell-Bold-Slanted
+ <->\cantarell@scale Cantarell-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fca}{b}{sc}{
- <->\cantarell@scale ts1-Cantarell-Bold
+ <->\cantarell@scale Cantarell-Bold-ts1
}{}
\DeclareFontShape{TS1}{fca}{b}{scsl}{
- <->\cantarell@scale ts1-Cantarell-Bold-Slanted
+ <->\cantarell@scale Cantarell-Bold-Slanted-ts1
}{}
\DeclareFontShape{TS1}{fca}{m}{it}{<->ssub * fca/m/sl}{}