cantarell 2.0 (23aug11)

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

1 files changed, 36 insertions, 21 deletions

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