cantarell 2.1 for 0.0.7 (30nov11)

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

6 files changed, 60 insertions, 57 deletions

diff --git a/Master/texmf-dist/doc/fonts/cantarell/CHANGES b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
index 85748a6f7f3..4a0f4148d48 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/CHANGES
+++ b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
@@ -5,3 +5,6 @@ Changelog for version 2.0:
           italics versions of Cantarell
 	- modify paths of the archive: documentation is now in
           doc/fonts/cantarell/ and sources in source/fonts/cantarell/
+
+Changelog for version 2.1:
+	- update .ttf files to version 0.0.7
diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README
index 736d88c6ad4..194cdbfb136 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/README
+++ b/Master/texmf-dist/doc/fonts/cantarell/README
@@ -1,5 +1,5 @@
 ------------------------
- Cantarell, version 2.0
+ Cantarell, version 2.1
 ------------------------
 
 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 03f156e01b9..4f4d5d19dfa 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
index e54a67cc4f1..e5f9e74382c 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
index 76e3e040689..594a6660579 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.0}
+\title{\LaTeX{} support for Cantarell\\Version~2.1}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
diff --git a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
index e556d574a61..5f4ded651b7 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
@@ -1,77 +1,77 @@
-./README
-./tex/latex/cantarell/ts1fca.fd
-./tex/latex/cantarell/t1fca.fd
-./tex/latex/cantarell/ot1fca.fd
-./tex/latex/cantarell/cantarell.sty
-./doc/fonts/cantarell/README
-./doc/fonts/cantarell/cantarell-samples.pdf
-./doc/fonts/cantarell/cantarell.tex
-./doc/fonts/cantarell/cantarell-samples.tex
-./doc/fonts/cantarell/cantarell.pdf
-./doc/fonts/cantarell/CHANGES
+./source/fonts/cantarell/cantarell-02.etx
 ./source/fonts/cantarell/sfd2type1.pe
-./source/fonts/cantarell/Makefile
-./source/fonts/cantarell/cantarell-fixtextcomp.mtx
-./source/fonts/cantarell/cantarell-drv.tex
+./source/fonts/cantarell/cantarell-01.etx
 ./source/fonts/cantarell/Cantarell-Regular.sfd
-./source/fonts/cantarell/Cantarell-Bold.sfd
 ./source/fonts/cantarell/cantarell-map.tex
+./source/fonts/cantarell/cantarell-drv.tex
+./source/fonts/cantarell/cantarell-fixtextcomp.mtx
+./source/fonts/cantarell/Cantarell-Bold.sfd
 ./source/fonts/cantarell/cantarell-fixlatin.mtx
-./source/fonts/cantarell/cantarell-01.etx
-./source/fonts/cantarell/cantarell-02.etx
-./manifest.txt
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
+./source/fonts/cantarell/Makefile
+./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
 ./fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
 ./fonts/map/dvips/cantarell/cantarell.map
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
+./fonts/afm/public/cantarell/Cantarell-Bold.afm
+./fonts/afm/public/cantarell/Cantarell-Regular.afm
 ./fonts/vf/public/cantarell/Cantarell-Regular-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
 ./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
 ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
 ./fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
 ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf
 ./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
 ./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
-./fonts/afm/public/cantarell/Cantarell-Regular.afm
-./fonts/afm/public/cantarell/Cantarell-Bold.afm
-./fonts/enc/dvips/cantarell/cantarell-02.enc
+./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
 ./fonts/enc/dvips/cantarell/cantarell-01.enc
-./fonts/type1/public/cantarell/Cantarell-Bold.pfb
+./fonts/enc/dvips/cantarell/cantarell-02.enc
 ./fonts/type1/public/cantarell/Cantarell-Regular.pfb
+./fonts/type1/public/cantarell/Cantarell-Bold.pfb
+./tex/latex/cantarell/ot1fca.fd
+./tex/latex/cantarell/cantarell.sty
+./tex/latex/cantarell/t1fca.fd
+./tex/latex/cantarell/ts1fca.fd
+./manifest.txt
+./doc/fonts/cantarell/CHANGES
+./doc/fonts/cantarell/cantarell.tex
+./doc/fonts/cantarell/cantarell-samples.tex
+./doc/fonts/cantarell/cantarell-samples.pdf
+./doc/fonts/cantarell/cantarell.pdf
+./doc/fonts/cantarell/README
+./README