summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-12 23:18:14 +0000
committerKarl Berry <karl@freefriends.org>2012-01-12 23:18:14 +0000
commit63d7aab3f0b4b0fe2331726ab503ccf7ab05a2ec (patch)
tree45d66a36f5a21221442056732f0918f3011b4bf0
parent11d507720ef021bc22dcee0c7828f1c73ad3f4c6 (diff)
cantarell (10jan12)
git-svn-id: svn://tug.org/texlive/trunk@25089 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/CHANGES3
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/README2
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdfbin101079 -> 100561 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.pdfbin68864 -> 69069 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.tex2
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm2
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc2
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfbbin65762 -> 65762 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfbbin47337 -> 47337 bytes
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/cantarell.sty5
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ot1fca.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t1fca.fd2
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ts1fca.fd2
15 files changed, 14 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/fonts/cantarell/CHANGES b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
index 4a0f4148d48..5bbec636dd4 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/CHANGES
+++ b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
@@ -8,3 +8,6 @@ Changelog for version 2.0:
Changelog for version 2.1:
- update .ttf files to version 0.0.7
+
+Changelog for version 2.2:
+ - remove unneeded call to textcomp package in cantarell.sty
diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README
index 194cdbfb136..ecafb96eed7 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/README
+++ b/Master/texmf-dist/doc/fonts/cantarell/README
@@ -1,5 +1,5 @@
------------------------
- Cantarell, version 2.1
+ Cantarell, version 2.2
------------------------
Cantarell is a contemporary Humanist sans serif designed by Dave Crossland and
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
index 4f4d5d19dfa..be5cdb5ebef 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
index e5f9e74382c..086c1eb73a2 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
index 594a6660579..6479fff94c1 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
@@ -38,7 +38,7 @@
\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
\newcommand{\program}{}
-\title{\LaTeX{} support for Cantarell\\Version~2.1}
+\title{\LaTeX{} support for Cantarell\\Version~2.2}
\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
index a57ce4fb202..caecc254d87 100644
--- a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20110222
-Comment Creation Date: Fri Nov 11 10:41:48 2011
+Comment Creation Date: Mon Jan 9 21:57:58 2012
FontName Cantarell-Bold
FullName Cantarell Bold
FamilyName Cantarell
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
index f34cf964691..6492b8b39f3 100644
--- a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20110222
-Comment Creation Date: Fri Nov 11 10:41:48 2011
+Comment Creation Date: Mon Jan 9 21:57:58 2012
FontName Cantarell-Regular
FullName Cantarell Regular
FamilyName Cantarell
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
index cf2195a3c54..c1bb42850db 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-01.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file cantarell-01.etx",
% version = "See file cantarell-01.etx",
-% date = "generated 2011/11/11",
+% date = "generated 2012/01/09",
% filename = "cantarell-01.enc",
% email = "See file cantarell-01.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
index bbafffab076..63715a8e9c2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-02.enc
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file cantarell-02.etx",
% version = "See file cantarell-02.etx",
-% date = "generated 2011/11/11",
+% date = "generated 2012/01/09",
% filename = "cantarell-02.enc",
% email = "See file cantarell-02.etx",
% codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
index 5be94474f76..dc6bbb48e19 100644
--- a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
index 25cf9ed2729..8aa5b3ff3d2 100644
--- a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
index 96f9ecbdc91..eaec95d6634 100644
--- a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
+++ b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
@@ -1,5 +1,5 @@
%% cantarell.sty
-%% Copyright 2011 Mohamed El Morabity
+%% Copyright 2011, 2012 Mohamed El Morabity
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License, either version 1.3 of this license or (at your option)
@@ -14,11 +14,10 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cantarell}[2011/07/24 Cantarell]
+\ProvidesPackage{cantarell}[2012/01/03 Cantarell]
\RequirePackage{keyval}
\RequirePackage{slantsc}
-\RequirePackage[warn]{textcomp}
% Taken from inconsolata.sty
\define@key{cantarell}{scale}[1.0]{\def\cantarell@scale{s*[#1]}}
diff --git a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
index c232d20c85e..e63c823766c 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/11/11 Fontinst v1.933 font definitions for OT1/fca.]
+ [2012/01/09 Fontinst v1.933 font definitions for OT1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
index 140305e4d24..94dab3e2ce4 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/11/11 Fontinst v1.933 font definitions for T1/fca.]
+ [2012/01/09 Fontinst v1.933 font definitions for T1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
index b23a4bb700a..103ffb938b5 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/11/11 Fontinst v1.933 font definitions for TS1/fca.]
+ [2012/01/09 Fontinst v1.933 font definitions for TS1/fca.]
\expandafter\ifx\csname cantarell@scale\endcsname\relax
\let\cantarell@scale\@empty