cantarell 2.0 (23aug11)

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

7 files changed, 122 insertions, 113 deletions

diff --git a/Master/texmf-dist/doc/fonts/cantarell/CHANGES b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
new file mode 100644
index 00000000000..85748a6f7f3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/CHANGES
@@ -0,0 +1,7 @@
+Changelog for version 2.0:
+	- complete rewrite of the fontinst driver file
+	- rename .vf and .tfm files based on the pattern <font>-<encoding>
+	- change slant angle for italics to comply with the slant of the first
+          italics versions of Cantarell
+	- modify paths of the archive: documentation is now in
+          doc/fonts/cantarell/ and sources in source/fonts/cantarell/
diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README
index 446bf000462..736d88c6ad4 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/README
+++ b/Master/texmf-dist/doc/fonts/cantarell/README
@@ -1,10 +1,10 @@
 ------------------------
- Cantarell, version 1.0
+ Cantarell, version 2.0
 ------------------------
 
 Cantarell is a contemporary Humanist sans serif designed by Dave Crossland and
 Jakub Steiner. This font, delivered under the OFL version 1.1, is available on
-the GNOME download server at
+The GNOME download server at
 http://download.gnome.org/sources/cantarell-fonts/0.0/.
 
 This package provides support for this font in LaTeX. It includes Type 1
@@ -12,7 +12,7 @@ versions of the fonts, converted for this package using FontForge from its
 sources, for full support with Dvips.
 
 Installation and usage instructions are described in
-doc/latex/cantarell/cantarell.pdf.
+doc/fonts/cantarell/cantarell.pdf.
 
 This package is released under the LaTeX Project Public License, either version
 1.3c or above, with the exception of the .pfb and .sfd files, released under the
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
index 8b4df023385..03f156e01b9 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-samples.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex
index 6e53d4cfd6f..09df5112a7c 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex
@@ -24,12 +24,15 @@
 
 \newcommand{\latinSample}{%
   \foreignlanguage{francais}{%
-    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils
+    sont doués de raison et de conscience et doivent agir les uns envers les
+    autres dans un esprit de fraternité.%
   }%
 }
 
 \newcommand{\miscSample}{%
-  0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+  0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{}
+  \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
 }
 
 \newcommand{\fontSample}[2]{%
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
index 5cb0e33e225..e54a67cc4f1 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 535448d15c3..76e3e040689 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
@@ -1,5 +1,5 @@
 %% cantarell.tex
-%% Copyright 2010 Mohamed El Morabity
+%% Copyright 2011 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)
@@ -21,7 +21,7 @@
 \usepackage{microtype}
 \usepackage{multirow}
 \usepackage{path}
-\usepackage{relsize}
+\usepackage{varioref}
 \usepackage[colorlinks]{hyperref}
 
 \hypersetup{%
@@ -38,7 +38,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Cantarell\\\relsize{-1}Version~1.0}
+\title{\LaTeX{} support for Cantarell\\Version~2.0}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -51,9 +51,20 @@
 \section{Introduction}
 
 Cantarell is a contemporary Humanist sans serif designed initially by Dave
-\name{Crossland} and maintained by Jakub \name{Steiner} also. This font,
-delivered under the \acronym{OFL} version~1.1, is available on the
-\acronym{GNOME} download server~\cite{cantarell}.
+\name{Crossland} and maintained by Jakub \name{Steiner} (see
+figure~\vref{styles}). This font, delivered under the \acronym{OFL} version~1.1,
+is available on the \acronym{GNOME} download server~\cite{cantarell}.
+
+\begin{figure}
+  \centering
+  {%
+    \fcafamily%
+    Cantarell Regular\\
+    {\bfseries Cantarell Bold}
+  }
+  \caption{Available styles for Cantarell}
+  \label{styles}
+\end{figure}
 
 This package provides support for this font in \LaTeX{}. It includes Type~1
 versions of the fonts, converted from its sources using \program{FontForge}, for
@@ -71,7 +82,7 @@ Once the \path|cantarell.zip| archive extracted:
   \path|texmf/| directory).
 \item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
   aware of the new files.
-\item Run \command{updmap --enable Map cantarell.map} to make \program{Dvips},
+\item Run \command{updmap --enable Map=cantarell.map} to make \program{Dvips},
   \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
 \end{enumerate}
 
@@ -90,9 +101,9 @@ You can use the Cantarell font in a \LaTeX{} document by adding the command
 to the preamble. The package supplies the \code{\char`\\fcafamily} command to
 switch the current font to Cantarell.
 
-\subsubsection{Options}
+\subsection{Options}
 
-\paragraph{Cantarell as default (sans-serif) font}
+\subsubsection{Cantarell as default (sans-serif) font}
 
 You can set \LaTeX{} to use Cantarell as standard font throughout the whole
 document by passing the \code{default} option to the package:
@@ -104,7 +115,7 @@ To set Cantarell as default sans-serif only:
 \usepackage[defaultsans]{cantarell}
 \end{verbatim}
 
-\paragraph{Font scaling}
+\subsubsection{Font scaling}
 
 The font can be up- and downscale by any factor. This can be used to make
 Cantarell more friendly when used in company with other type faces, e.g., to
@@ -116,10 +127,8 @@ the font according to \parameter{ratio} (1.0 by default), for example:
 
 \subsection{Encodings}
 
-The following encodings are supported:
-\begin{center}
-  OT1, T1, TS1 (partial)
-\end{center}
+The following encodings are supported: OT1, T1, TS1 (partial).
+
 To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
 package as usual, as in
 \begin{verbatim}
@@ -129,24 +138,30 @@ package as usual, as in
 
 \subsection{Available weights and variants}
 
-The following table lists the available font series and shapes with their
+Table~\vref{nfss} lists the available font series and shapes with their
 \acronym{NFSS} classification. Parenthesized combinations are provided via
 substitutions.
-\begin{center}
+\begin{table}
+  \centering
   \begin{tabular}{llll}
     \toprule
     family&encoding&series&shape\\
     \midrule
-    \multirow{3}{*}{fca}&\multirow{2}{*}{OT1, T1}&\multirow{2}{*}{m, b (bx)}&n, sl (it)\\
-    &&&sc, scsl (scit)\\
-    \cmidrule{2-4}
-    &TS1&m, b (bx)&n, sl (it)\\
+    \multirow{3}{*}{fca}&OT1, T1&\multirow{2}{*}{m, b (bx)}&n, sl (it), sc, scsl (scit)\\
+    \cmidrule{2-2}
+    \cmidrule{4-4}
+    &TS1&&n, sl (it)\\
     \bottomrule
   \end{tabular}
-\end{center}
+  \caption{Available font series and shapes for Cantarell}
+  \label{nfss}
+\end{table}
 Notice that the slanted shapes are faked ones, as well as the small capitals
 (reduced to 80\%).
 
+Samples of the font are available in the
+\href{run:cantarell-samples.pdf}{\path|cantarell-samples.pdf|} file.
+
 \section{Known bugs and improvements}
 
 Please send bug reports and suggestions about the Cantarell \LaTeX{} support to
diff --git a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
index e3dfc75e5ce..e556d574a61 100644
--- a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
@@ -1,93 +1,77 @@
-./fonts/type1/public/cantarell/Cantarell-Bold.pfb
-./fonts/type1/public/cantarell/Cantarell-Regular.pfb
-./fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf
-./fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Bold.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Regular.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf
-./fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf
-./fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf
-./fonts/map/dvips/cantarell/cantarell.map
-./fonts/enc/dvips/cantarell/cantarell-fixlatin.enc
-./fonts/enc/dvips/cantarell/cantarell-t1.enc
-./fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc
-./fonts/enc/dvips/cantarell/cantarell-ot1.enc
-./fonts/enc/dvips/cantarell/cantarell-ts1.enc
-./fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm
-./fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm
-./fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm
-./fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm
-./fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm
-./fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm
-./fonts/afm/public/cantarell/Cantarell-Regular.afm
-./fonts/afm/public/cantarell/Cantarell-Bold.afm
-./source/cantarell/cantarell-fixlatin.etx
-./source/cantarell/cantarell-reglyph.tex
-./source/cantarell/cantarell-fixtextcomp.etx
-./source/cantarell/cantarell-map.tex
-./source/cantarell/Makefile
-./source/cantarell/sfd2type1.pe
-./source/cantarell/cantarell-samples.pdf
-./source/cantarell/cantarell.tex
-./source/cantarell/cantarell-drv.tex
-./source/cantarell/README
-./source/cantarell/cantarell-samples.tex
-./source/cantarell/cantarell.pdf
-./doc/latex/cantarell/cantarell-samples.pdf
-./doc/latex/cantarell/cantarell.tex
-./doc/latex/cantarell/README
-./doc/latex/cantarell/cantarell-samples.tex
-./doc/latex/cantarell/cantarell.pdf
 ./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/sfd2type1.pe
+./source/fonts/cantarell/Makefile
+./source/fonts/cantarell/cantarell-fixtextcomp.mtx
+./source/fonts/cantarell/cantarell-drv.tex
+./source/fonts/cantarell/Cantarell-Regular.sfd
+./source/fonts/cantarell/Cantarell-Bold.sfd
+./source/fonts/cantarell/cantarell-map.tex
+./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
+./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.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-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-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-Bold-t1.tfm
+./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.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/vf/public/cantarell/Cantarell-Regular-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
+./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-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-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/enc/dvips/cantarell/cantarell-01.enc
+./fonts/type1/public/cantarell/Cantarell-Bold.pfb
+./fonts/type1/public/cantarell/Cantarell-Regular.pfb