summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/README22
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdfbin0 -> 103376 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex63
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.pdfbin0 -> 73717 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/cantarell.tex173
-rw-r--r--Master/texmf-dist/doc/fonts/cantarell/manifest.txt93
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm416
-rw-r--r--Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm415
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc317
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc317
-rw-r--r--Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map20
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfmbin0 -> 1488 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfmbin0 -> 1488 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfmbin0 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfmbin0 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfmbin0 -> 1396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfmbin0 -> 1416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfmbin0 -> 1332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfmbin0 -> 328 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfmbin0 -> 292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfmbin0 -> 332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfmbin0 -> 296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfmbin0 -> 524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfmbin0 -> 440 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfmbin0 -> 500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfmbin0 -> 432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfmbin0 -> 1308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfmbin0 -> 1216 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfmbin0 -> 1240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfmbin0 -> 1156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfmbin0 -> 1960 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfmbin0 -> 1788 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfmbin0 -> 1792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfmbin0 -> 1632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfmbin0 -> 1392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfmbin0 -> 1300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfmbin0 -> 1376 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfmbin0 -> 1292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfmbin0 -> 2176 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfmbin0 -> 2136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfmbin0 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfmbin0 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfmbin0 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfmbin0 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfmbin0 -> 1804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfmbin0 -> 1816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfmbin0 -> 1584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfmbin0 -> 1464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfmbin0 -> 1552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfmbin0 -> 1440 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfbbin0 -> 68121 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfbbin0 -> 46707 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vfbin0 -> 1680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vfbin0 -> 1488 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vfbin0 -> 1656 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vfbin0 -> 1472 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vfbin0 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vfbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vfbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vfbin0 -> 2660 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vfbin0 -> 1884 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vfbin0 -> 2628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vfbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vfbin0 -> 2672 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vfbin0 -> 1888 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vfbin0 -> 2640 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vfbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vfbin0 -> 3700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vfbin0 -> 3652 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vfbin0 -> 3664 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vfbin0 -> 3616 bytes
-rw-r--r--Master/texmf-dist/source/cantarell/Makefile217
-rw-r--r--Master/texmf-dist/source/cantarell/README22
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-drv.tex137
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-fixlatin.etx75
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-fixtextcomp.etx137
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-map.tex28
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-reglyph.tex71
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-samples.pdfbin0 -> 103376 bytes
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell-samples.tex63
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell.pdfbin0 -> 73717 bytes
-rw-r--r--Master/texmf-dist/source/cantarell/cantarell.tex173
-rw-r--r--Master/texmf-dist/source/cantarell/sfd2type1.pe22
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/cantarell.sty47
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ot1fca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/t1fca.fd59
-rw-r--r--Master/texmf-dist/tex/latex/cantarell/ts1fca.fd59
92 files changed, 3956 insertions, 0 deletions
diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README
new file mode 100644
index 00000000000..446bf000462
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/README
@@ -0,0 +1,22 @@
+------------------------
+ Cantarell, version 1.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
+http://download.gnome.org/sources/cantarell-fonts/0.0/.
+
+This package provides support for this font in LaTeX. It includes Type 1
+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.
+
+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
+Open Font License version 1.1.
+
+If you have comments about the package, please contact Mohamed El Morabity
+(melmorabity AT fedoraproject DOT org).
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
new file mode 100644
index 00000000000..8b4df023385
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex
new file mode 100644
index 00000000000..6e53d4cfd6f
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex
@@ -0,0 +1,63 @@
+%% cantarell-samples.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[francais,american]{babel}
+\usepackage{cantarell}
+\usepackage[T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\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é.%
+ }%
+}
+
+\newcommand{\miscSample}{%
+ 0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+ {\usefont{T1}{fca}{#1}{#2} \latinSample}
+
+ {\fontfamily{fca}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Cantarell Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\section*{Cantarell Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf
new file mode 100644
index 00000000000..5cb0e33e225
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..535448d15c3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex
@@ -0,0 +1,173 @@
+%% cantarell.tex
+%% Copyright 2010 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[american]{babel}
+\usepackage{booktabs}
+\usepackage[default]{cantarell}
+\usepackage{microtype}
+\usepackage{multirow}
+\usepackage{path}
+\usepackage{relsize}
+\usepackage[colorlinks]{hyperref}
+
+\hypersetup{%
+ pdftitle={LaTeX support for Cantarell},%
+ pdfauthor={Mohamed El Morabity}%
+}%
+
+\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
+\newcommand{\code}{\texttt}
+\newcommand{\command}{\texttt}
+\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
+\newcommand{\name}{}
+\newcommand{\package}{\texttt}
+\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
+\newcommand{\program}{}
+
+\title{\LaTeX{} support for Cantarell\\\relsize{-1}Version~1.0}
+
+\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\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}.
+
+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
+full support with \program{Dvips}.
+
+\section{Installation}
+
+These directions assume that your \TeX{} distribution is
+\acronym{TDS}-compliant.
+
+Once the \path|cantarell.zip| archive extracted:
+\begin{enumerate}
+\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
+ directories to your \path|texmf/| directory (either your local or global
+ \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},
+ \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
+\end{enumerate}
+
+Note that this package requires the \package{keyval}~\cite{keyval} and
+\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
+work.
+
+\section{Usage}
+
+\subsection{Calling Cantarell}
+
+You can use the Cantarell font in a \LaTeX{} document by adding the command
+\begin{verbatim}
+\usepackage{cantarell}
+\end{verbatim}
+to the preamble. The package supplies the \code{\char`\\fcafamily} command to
+switch the current font to Cantarell.
+
+\subsubsection{Options}
+
+\paragraph{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:
+\begin{verbatim}
+\usepackage[default]{cantarell}
+\end{verbatim}
+To set Cantarell as default sans-serif only:
+\begin{verbatim}
+\usepackage[defaultsans]{cantarell}
+\end{verbatim}
+
+\paragraph{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
+adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
+the font according to \parameter{ratio} (1.0 by default), for example:
+\begin{verbatim}
+\usepackage[scale=0.95]{cantarell}
+\end{verbatim}
+
+\subsection{Encodings}
+
+The following encodings are supported:
+\begin{center}
+ OT1, T1, TS1 (partial)
+\end{center}
+To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
+package as usual, as in
+\begin{verbatim}
+\usepackage[T1]{fontenc}
+\usepackage{cantarell}
+\end{verbatim}
+
+\subsection{Available weights and variants}
+
+The following table lists the available font series and shapes with their
+\acronym{NFSS} classification. Parenthesized combinations are provided via
+substitutions.
+\begin{center}
+ \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)\\
+ \bottomrule
+ \end{tabular}
+\end{center}
+Notice that the slanted shapes are faked ones, as well as the small capitals
+(reduced to 80\%).
+
+\section{Known bugs and improvements}
+
+Please send bug reports and suggestions about the Cantarell \LaTeX{} support to
+\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}, neither
+to Dave \name{Crossland} nor the \acronym{GNOME} project. They only distribute
+the font files themselves.
+
+\section{License}
+
+This package is released under the \LaTeX{} project public license, either
+version~1.3c or above~\cite{lppl}. Anyway both the Type~1 and Fontforge source
+files are delivered under the Open Font License version~1.1~\cite{ofl}.
+
+\begin{thebibliography}{9}
+\bibitem{cantarell} \url{http://download.gnome.org/sources/cantarell-fonts/0.0/}
+\bibitem{keyval}
+ \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
+\bibitem{slantsc}
+ \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
+\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
+\bibitem{ofl} \url{http://scripts.sil.org/OFL_web}
+\end{thebibliography}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
new file mode 100644
index 00000000000..e3dfc75e5ce
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt
@@ -0,0 +1,93 @@
+./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
+./manifest.txt
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
new file mode 100644
index 00000000000..2accc38b5d1
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Bold.afm
@@ -0,0 +1,416 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20110222
+Comment Creation Date: Wed Apr 6 02:42:30 2011
+FontName Cantarell-Bold
+FullName Cantarell Bold
+FamilyName Cantarell
+Weight Bold
+Notice (Copyright (c) 2009-2011, Understanding Limited (dave@understandinglimited.com),)
+Comment Copyright (c) 2010-2011, Jakub Steiner (jimmac@gmail.com).
+Comment
+Comment This Font Software is licensed under the SIL Open Font License, Version 1.1.
+Comment This license is copied below, and is also available with a FAQ at:
+Comment http://scripts.sil.org/OFL
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -113
+UnderlineThickness 56
+Version 0.0.6
+EncodingScheme ISO10646-1
+FontBBox -60 -286 1157 1053
+CapHeight 694
+XHeight 482
+Ascender 694
+Descender -259
+StartCharMetrics 389
+C 32 ; WX 273 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 266 ; N exclam ; B 64 -20 203 714 ;
+C 34 ; WX 368 ; N quotedbl ; B 24 509 345 758 ;
+C 35 ; WX 682 ; N numbersign ; B 1 -35 683 714 ;
+C 36 ; WX 607 ; N dollar ; B 79 -32 539 738 ;
+C 37 ; WX 712 ; N percent ; B 30 0 702 694 ;
+C 38 ; WX 750 ; N ampersand ; B 48 -43 737 723 ;
+C 39 ; WX 177 ; N quotesingle ; B 24 509 155 758 ;
+C 40 ; WX 334 ; N parenleft ; B 62 -227 327 782 ;
+C 41 ; WX 334 ; N parenright ; B 7 -227 272 782 ;
+C 42 ; WX 549 ; N asterisk ; B 43 250 508 714 ;
+C 43 ; WX 659 ; N plus ; B 29 21 632 622 ;
+C 44 ; WX 262 ; N comma ; B -7 -127 218 103 ;
+C 45 ; WX 553 ; N hyphen ; B 46 268 507 375 ;
+C 46 ; WX 239 ; N period ; B 48 -20 191 123 ;
+C 47 ; WX 361 ; N slash ; B -6 -64 376 714 ;
+C 48 ; WX 727 ; N zero ; B 60 -10 667 703 ;
+C 49 ; WX 594 ; N one ; B 73 0 561 694 ;
+C 50 ; WX 666 ; N two ; B 30 0 576 699 ;
+C 51 ; WX 660 ; N three ; B 55 -22 590 702 ;
+C 52 ; WX 699 ; N four ; B 40 0 637 694 ;
+C 53 ; WX 666 ; N five ; B 60 -10 616 694 ;
+C 54 ; WX 667 ; N six ; B 60 -12 607 699 ;
+C 55 ; WX 677 ; N seven ; B 50 0 637 694 ;
+C 56 ; WX 649 ; N eight ; B 40 -10 609 703 ;
+C 57 ; WX 668 ; N nine ; B 60 -7 608 704 ;
+C 58 ; WX 239 ; N colon ; B 48 -20 191 505 ;
+C 59 ; WX 262 ; N semicolon ; B -7 -127 218 505 ;
+C 60 ; WX 506 ; N less ; B 20 27 487 583 ;
+C 61 ; WX 634 ; N equal ; B 62 151 572 486 ;
+C 62 ; WX 506 ; N greater ; B 20 27 487 583 ;
+C 63 ; WX 486 ; N question ; B 16 -20 442 722 ;
+C 64 ; WX 992 ; N at ; B 48 -229 960 703 ;
+C 65 ; WX 690 ; N A ; B 40 0 683 694 ;
+C 66 ; WX 680 ; N B ; B 92 0 632 694 ;
+C 67 ; WX 702 ; N C ; B 86 -10 680 699 ;
+C 68 ; WX 756 ; N D ; B 94 0 696 694 ;
+C 69 ; WX 614 ; N E ; B 92 0 554 694 ;
+C 70 ; WX 601 ; N F ; B 92 0 551 694 ;
+C 71 ; WX 756 ; N G ; B 68 -10 704 699 ;
+C 72 ; WX 759 ; N H ; B 90 0 670 694 ;
+C 73 ; WX 303 ; N I ; B 90 0 213 694 ;
+C 74 ; WX 479 ; N J ; B 34 -8 413 694 ;
+C 75 ; WX 691 ; N K ; B 92 0 673 694 ;
+C 76 ; WX 563 ; N L ; B 92 0 543 694 ;
+C 77 ; WX 884 ; N M ; B 90 0 795 694 ;
+C 78 ; WX 786 ; N N ; B 90 0 696 694 ;
+C 79 ; WX 801 ; N O ; B 68 -7 753 701 ;
+C 80 ; WX 645 ; N P ; B 92 0 603 694 ;
+C 81 ; WX 816 ; N Q ; B 68 -36 776 701 ;
+C 82 ; WX 693 ; N R ; B 92 0 656 694 ;
+C 83 ; WX 657 ; N S ; B 75 -10 610 700 ;
+C 84 ; WX 630 ; N T ; B 27 0 628 694 ;
+C 85 ; WX 748 ; N U ; B 90 -10 659 694 ;
+C 86 ; WX 694 ; N V ; B 44 0 683 694 ;
+C 87 ; WX 1115 ; N W ; B 44 0 1102 694 ;
+C 88 ; WX 698 ; N X ; B 34 0 710 694 ;
+C 89 ; WX 658 ; N Y ; B 31 0 665 694 ;
+C 90 ; WX 671 ; N Z ; B 49 0 648 694 ;
+C 91 ; WX 350 ; N bracketleft ; B 73 -220 338 758 ;
+C 92 ; WX 361 ; N backslash ; B -13 -64 369 714 ;
+C 93 ; WX 346 ; N bracketright ; B 13 -220 278 758 ;
+C 94 ; WX 608 ; N asciicircum ; B 135 541 455 782 ;
+C 95 ; WX 535 ; N underscore ; B 38 -20 499 93 ;
+C 96 ; WX 487 ; N grave ; B 76 543 413 802 ;
+C 97 ; WX 563 ; N a ; B 42 -10 497 492 ;
+C 98 ; WX 592 ; N b ; B 66 -10 542 694 ;
+C 99 ; WX 518 ; N c ; B 44 -10 479 491 ;
+C 100 ; WX 592 ; N d ; B 44 -10 523 693 ;
+C 101 ; WX 562 ; N e ; B 44 -9 520 492 ;
+C 102 ; WX 459 ; N f ; B 47 0 467 698 ;
+C 103 ; WX 589 ; N g ; B 44 -264 523 492 ;
+C 104 ; WX 584 ; N h ; B 66 0 517 693 ;
+C 105 ; WX 253 ; N i ; B 57 0 192 694 ;
+C 106 ; WX 270 ; N j ; B 6 -266 220 694 ;
+C 107 ; WX 558 ; N k ; B 62 0 544 694 ;
+C 108 ; WX 322 ; N l ; B 68 -10 310 694 ;
+C 109 ; WX 877 ; N m ; B 62 0 809 492 ;
+C 110 ; WX 580 ; N n ; B 62 0 512 492 ;
+C 111 ; WX 608 ; N o ; B 44 -10 560 492 ;
+C 112 ; WX 591 ; N p ; B 62 -259 541 492 ;
+C 113 ; WX 584 ; N q ; B 44 -259 519 492 ;
+C 114 ; WX 429 ; N r ; B 62 0 424 492 ;
+C 115 ; WX 524 ; N s ; B 44 -10 484 492 ;
+C 116 ; WX 432 ; N t ; B 24 -10 411 621 ;
+C 117 ; WX 586 ; N u ; B 62 -10 518 482 ;
+C 118 ; WX 526 ; N v ; B 22 0 516 482 ;
+C 119 ; WX 877 ; N w ; B 20 0 870 482 ;
+C 120 ; WX 558 ; N x ; B 22 0 559 482 ;
+C 121 ; WX 559 ; N y ; B 17 -259 555 482 ;
+C 122 ; WX 546 ; N z ; B 52 0 491 482 ;
+C 123 ; WX 393 ; N braceleft ; B 19 -223 383 759 ;
+C 124 ; WX 365 ; N bar ; B 123 -170 244 802 ;
+C 125 ; WX 393 ; N braceright ; B 14 -223 377 759 ;
+C 126 ; WX 583 ; N asciitilde ; B 90 282 493 476 ;
+C 160 ; WX 273 ; N uni00A0 ; B 0 0 0 0 ;
+C 161 ; WX 317 ; N exclamdown ; B 90 -220 228 665 ;
+C 162 ; WX 498 ; N cent ; B 53 -52 467 758 ;
+C 163 ; WX 634 ; N sterling ; B 54 -20 581 719 ;
+C 164 ; WX 634 ; N currency ; B 62 107 572 618 ;
+C 165 ; WX 634 ; N yen ; B 35 -20 600 714 ;
+C 166 ; WX 431 ; N brokenbar ; B 156 -170 276 802 ;
+C 167 ; WX 554 ; N section ; B 53 -30 496 720 ;
+C 168 ; WX 585 ; N dieresis ; B 118 583 468 714 ;
+C 169 ; WX 859 ; N copyright ; B 63 -27 796 694 ;
+C 170 ; WX 374 ; N ordfeminine ; B 73 350 315 666 ;
+C 171 ; WX 526 ; N guillemotleft ; B 12 106 521 502 ;
+C 172 ; WX 683 ; N logicalnot ; B 41 118 643 377 ;
+C 173 ; WX 524 ; N uni00AD ; B 87 268 437 375 ;
+C 174 ; WX 601 ; N registered ; B 32 244 570 774 ;
+C 175 ; WX 683 ; N macron ; B 119 708 564 821 ;
+C 176 ; WX 287 ; N degree ; B 17 473 271 732 ;
+C 177 ; WX 683 ; N plusminus ; B 87 53 596 714 ;
+C 178 ; WX 390 ; N uni00B2 ; B 48 358 319 756 ;
+C 179 ; WX 390 ; N uni00B3 ; B 46 354 314 755 ;
+C 180 ; WX 547 ; N acute ; B 107 542 441 802 ;
+C 181 ; WX 579 ; N uni00B5 ; B 73 -220 512 502 ;
+C 182 ; WX 647 ; N paragraph ; B 43 -20 575 758 ;
+C 183 ; WX 288 ; N periodcentered ; B 73 287 215 429 ;
+C 184 ; WX 537 ; N cedilla ; B 164 -263 419 31 ;
+C 185 ; WX 265 ; N uni00B9 ; B 15 359 180 750 ;
+C 186 ; WX 372 ; N ordmasculine ; B 21 355 352 754 ;
+C 187 ; WX 526 ; N guillemotright ; B 5 106 514 502 ;
+C 188 ; WX 878 ; N onequarter ; B 59 -12 820 706 ;
+C 189 ; WX 926 ; N onehalf ; B 59 -12 860 706 ;
+C 190 ; WX 952 ; N threequarters ; B 80 -12 894 720 ;
+C 191 ; WX 511 ; N questiondown ; B 37 -89 461 714 ;
+C 192 ; WX 755 ; N Agrave ; B 63 0 748 950 ;
+C 193 ; WX 755 ; N Aacute ; B 63 0 748 950 ;
+C 194 ; WX 755 ; N Acircumflex ; B 63 0 748 949 ;
+C 195 ; WX 755 ; N Atilde ; B 63 0 748 920 ;
+C 196 ; WX 755 ; N Adieresis ; B 63 0 748 926 ;
+C 197 ; WX 755 ; N Aring ; B 63 0 748 915 ;
+C 198 ; WX 1015 ; N AE ; B 63 0 946 694 ;
+C 199 ; WX 788 ; N Ccedilla ; B 134 -247 765 699 ;
+C 200 ; WX 706 ; N Egrave ; B 142 0 628 959 ;
+C 201 ; WX 706 ; N Eacute ; B 142 0 628 959 ;
+C 202 ; WX 706 ; N Ecircumflex ; B 142 0 628 953 ;
+C 203 ; WX 706 ; N Edieresis ; B 142 0 628 927 ;
+C 204 ; WX 396 ; N Igrave ; B 66 0 402 949 ;
+C 205 ; WX 436 ; N Iacute ; B 62 0 437 950 ;
+C 206 ; WX 396 ; N Icircumflex ; B 68 0 388 949 ;
+C 207 ; WX 367 ; N Idieresis ; B 43 0 363 891 ;
+C 208 ; WX 863 ; N Eth ; B 57 0 808 694 ;
+C 209 ; WX 890 ; N Ntilde ; B 142 0 788 920 ;
+C 210 ; WX 903 ; N Ograve ; B 105 -7 837 951 ;
+C 211 ; WX 903 ; N Oacute ; B 105 -7 837 950 ;
+C 212 ; WX 903 ; N Ocircumflex ; B 105 -7 837 949 ;
+C 213 ; WX 903 ; N Otilde ; B 105 -7 837 920 ;
+C 214 ; WX 903 ; N Odieresis ; B 105 -7 837 927 ;
+C 215 ; WX 714 ; N multiply ; B 89 77 641 554 ;
+C 216 ; WX 937 ; N Oslash ; B 78 -7 881 701 ;
+C 217 ; WX 851 ; N Ugrave ; B 142 -10 749 963 ;
+C 218 ; WX 851 ; N Uacute ; B 142 -10 749 965 ;
+C 219 ; WX 851 ; N Ucircumflex ; B 142 -10 749 949 ;
+C 220 ; WX 851 ; N Udieresis ; B 142 -10 749 927 ;
+C 221 ; WX 696 ; N Yacute ; B 49 0 710 965 ;
+C 222 ; WX 727 ; N Thorn ; B 142 0 684 694 ;
+C 223 ; WX 694 ; N germandbls ; B 98 -13 636 698 ;
+C 224 ; WX 602 ; N agrave ; B 60 -10 514 760 ;
+C 225 ; WX 602 ; N aacute ; B 60 -10 514 765 ;
+C 226 ; WX 602 ; N acircumflex ; B 60 -10 514 737 ;
+C 227 ; WX 602 ; N atilde ; B 60 -10 528 708 ;
+C 228 ; WX 602 ; N adieresis ; B 60 -10 516 694 ;
+C 229 ; WX 602 ; N aring ; B 60 -10 514 768 ;
+C 230 ; WX 897 ; N ae ; B 60 -10 833 491 ;
+C 231 ; WX 568 ; N ccedilla ; B 63 -243 518 488 ;
+C 232 ; WX 618 ; N egrave ; B 63 -10 555 765 ;
+C 233 ; WX 618 ; N eacute ; B 63 -10 555 765 ;
+C 234 ; WX 618 ; N ecircumflex ; B 63 -10 555 737 ;
+C 235 ; WX 618 ; N edieresis ; B 63 -10 555 694 ;
+C 236 ; WX 295 ; N igrave ; B 0 0 278 765 ;
+C 237 ; WX 295 ; N iacute ; B 55 0 333 765 ;
+C 238 ; WX 298 ; N icircumflex ; B 8 0 296 739 ;
+C 239 ; WX 295 ; N idieresis ; B -7 0 303 694 ;
+C 240 ; WX 691 ; N eth ; B 63 -10 604 716 ;
+C 241 ; WX 654 ; N ntilde ; B 88 0 570 710 ;
+C 242 ; WX 671 ; N ograve ; B 63 -10 608 765 ;
+C 243 ; WX 671 ; N oacute ; B 63 -10 608 765 ;
+C 244 ; WX 671 ; N ocircumflex ; B 63 -10 608 737 ;
+C 245 ; WX 671 ; N otilde ; B 63 -10 608 710 ;
+C 246 ; WX 671 ; N odieresis ; B 63 -10 608 694 ;
+C 247 ; WX 763 ; N divide ; B 61 41 703 602 ;
+C 248 ; WX 671 ; N oslash ; B 60 -27 630 498 ;
+C 249 ; WX 654 ; N ugrave ; B 88 -10 567 765 ;
+C 250 ; WX 654 ; N uacute ; B 88 -10 567 765 ;
+C 251 ; WX 654 ; N ucircumflex ; B 88 -10 567 737 ;
+C 252 ; WX 654 ; N udieresis ; B 88 -10 567 694 ;
+C 253 ; WX 592 ; N yacute ; B 24 -259 587 765 ;
+C 254 ; WX 676 ; N thorn ; B 93 -259 613 694 ;
+C 255 ; WX 592 ; N ydieresis ; B 24 -259 587 694 ;
+C -1 ; WX 755 ; N Amacron ; B 63 0 748 829 ;
+C -1 ; WX 602 ; N amacron ; B 60 -10 514 651 ;
+C -1 ; WX 755 ; N Abreve ; B 63 0 748 926 ;
+C -1 ; WX 602 ; N abreve ; B 60 -10 555 714 ;
+C -1 ; WX 795 ; N Aogonek ; B 63 -266 788 694 ;
+C -1 ; WX 602 ; N aogonek ; B 60 -265 517 485 ;
+C -1 ; WX 788 ; N Cacute ; B 134 -10 765 973 ;
+C -1 ; WX 568 ; N cacute ; B 63 -10 518 765 ;
+C -1 ; WX 788 ; N Ccircumflex ; B 134 -10 765 953 ;
+C -1 ; WX 568 ; N ccircumflex ; B 63 -10 518 741 ;
+C -1 ; WX 788 ; N Cdotaccent ; B 134 -10 765 893 ;
+C -1 ; WX 568 ; N cdotaccent ; B 63 -10 518 694 ;
+C -1 ; WX 788 ; N Ccaron ; B 134 -10 765 952 ;
+C -1 ; WX 568 ; N ccaron ; B 63 -10 518 740 ;
+C -1 ; WX 860 ; N Dcaron ; B 142 0 782 953 ;
+C -1 ; WX 841 ; N dcaron ; B 63 -10 825 738 ;
+C -1 ; WX 863 ; N Dcroat ; B 57 0 808 694 ;
+C -1 ; WX 684 ; N dcroat ; B 63 -10 633 738 ;
+C -1 ; WX 706 ; N Emacron ; B 142 0 628 829 ;
+C -1 ; WX 618 ; N emacron ; B 63 -10 555 651 ;
+C -1 ; WX 706 ; N Ebreve ; B 142 0 634 926 ;
+C -1 ; WX 618 ; N ebreve ; B 63 -10 584 714 ;
+C -1 ; WX 706 ; N Edotaccent ; B 142 0 628 893 ;
+C -1 ; WX 618 ; N edotaccent ; B 63 -10 555 694 ;
+C -1 ; WX 706 ; N Eogonek ; B 142 -265 633 694 ;
+C -1 ; WX 618 ; N eogonek ; B 63 -266 555 487 ;
+C -1 ; WX 706 ; N Ecaron ; B 142 0 628 952 ;
+C -1 ; WX 618 ; N ecaron ; B 63 -10 555 740 ;
+C -1 ; WX 856 ; N Gcircumflex ; B 105 -10 784 953 ;
+C -1 ; WX 654 ; N gcircumflex ; B 62 -264 566 741 ;
+C -1 ; WX 856 ; N Gbreve ; B 105 -10 784 926 ;
+C -1 ; WX 654 ; N gbreve ; B 62 -264 590 714 ;
+C -1 ; WX 856 ; N Gdotaccent ; B 105 -10 784 893 ;
+C -1 ; WX 654 ; N gdotaccent ; B 62 -264 566 694 ;
+C -1 ; WX 856 ; N Gcommaaccent ; B 105 -259 784 699 ;
+C -1 ; WX 654 ; N gcommaaccent ; B 62 -265 566 755 ;
+C -1 ; WX 861 ; N Hcircumflex ; B 142 0 759 955 ;
+C -1 ; WX 661 ; N hcircumflex ; B 93 0 574 979 ;
+C -1 ; WX 861 ; N Hbar ; B 68 0 832 694 ;
+C -1 ; WX 661 ; N hbar ; B 27 0 574 738 ;
+C -1 ; WX 396 ; N Itilde ; B 41 0 403 915 ;
+C -1 ; WX 295 ; N itilde ; B -28 0 334 746 ;
+C -1 ; WX 396 ; N Imacron ; B 98 0 338 829 ;
+C -1 ; WX 295 ; N imacron ; B 39 0 257 651 ;
+C -1 ; WX 436 ; N Ibreve ; B 42 0 434 925 ;
+C -1 ; WX 335 ; N ibreve ; B -21 0 371 749 ;
+C -1 ; WX 396 ; N Iogonek ; B 15 -266 287 694 ;
+C -1 ; WX 295 ; N iogonek ; B -60 -271 215 694 ;
+C -1 ; WX 396 ; N Idotaccent ; B 146 0 288 893 ;
+C -1 ; WX 295 ; N dotlessi ; B 88 0 208 482 ;
+C -1 ; WX 941 ; N IJ ; B 156 -8 843 694 ;
+C -1 ; WX 591 ; N ij ; B 81 -266 511 694 ;
+C -1 ; WX 545 ; N Jcircumflex ; B 54 -8 540 953 ;
+C -1 ; WX 295 ; N jcircumflex ; B 8 -266 296 739 ;
+C -1 ; WX 771 ; N Kcommaaccent ; B 142 -250 756 694 ;
+C -1 ; WX 604 ; N kcommaaccent ; B 88 -250 592 738 ;
+C -1 ; WX 603 ; N kgreenlandic ; B 88 0 593 482 ;
+C -1 ; WX 633 ; N Lacute ; B 138 0 623 973 ;
+C -1 ; WX 355 ; N lacute ; B 78 0 453 1009 ;
+C -1 ; WX 633 ; N Lcommaaccent ; B 141 -250 626 694 ;
+C -1 ; WX 315 ; N lcommaaccent ; B 34 -250 259 738 ;
+C -1 ; WX 633 ; N Lcaron ; B 142 0 616 694 ;
+C -1 ; WX 433 ; N lcaron ; B 98 0 416 738 ;
+C -1 ; WX 633 ; N Ldot ; B 142 0 616 694 ;
+C -1 ; WX 442 ; N ldot ; B 98 0 403 738 ;
+C -1 ; WX 633 ; N Lslash ; B 71 0 616 694 ;
+C -1 ; WX 375 ; N lslash ; B 44 0 336 738 ;
+C -1 ; WX 890 ; N Nacute ; B 142 0 788 973 ;
+C -1 ; WX 654 ; N nacute ; B 88 0 567 763 ;
+C -1 ; WX 890 ; N Ncommaaccent ; B 142 -250 788 694 ;
+C -1 ; WX 654 ; N ncommaaccent ; B 88 -250 567 492 ;
+C -1 ; WX 890 ; N Ncaron ; B 142 0 788 952 ;
+C -1 ; WX 654 ; N ncaron ; B 88 0 567 742 ;
+C -1 ; WX 737 ; N napostrophe ; B 34 0 649 694 ;
+C -1 ; WX 884 ; N Eng ; B 142 -178 782 724 ;
+C -1 ; WX 654 ; N eng ; B 88 -169 566 492 ;
+C -1 ; WX 903 ; N Omacron ; B 105 -7 837 829 ;
+C -1 ; WX 671 ; N omacron ; B 63 -10 608 622 ;
+C -1 ; WX 903 ; N Obreve ; B 105 -7 837 926 ;
+C -1 ; WX 671 ; N obreve ; B 63 -10 608 714 ;
+C -1 ; WX 903 ; N Ohungarumlaut ; B 105 -7 837 982 ;
+C -1 ; WX 671 ; N ohungarumlaut ; B 63 -10 655 765 ;
+C -1 ; WX 1055 ; N OE ; B 105 0 978 694 ;
+C -1 ; WX 960 ; N oe ; B 63 -11 897 489 ;
+C -1 ; WX 782 ; N Racute ; B 142 0 737 973 ;
+C -1 ; WX 471 ; N racute ; B 88 0 472 765 ;
+C -1 ; WX 782 ; N Rcommaaccent ; B 142 -250 739 694 ;
+C -1 ; WX 471 ; N rcommaaccent ; B 13 -250 481 492 ;
+C -1 ; WX 782 ; N Rcaron ; B 142 0 737 952 ;
+C -1 ; WX 471 ; N rcaron ; B 88 0 472 740 ;
+C -1 ; WX 744 ; N Sacute ; B 117 -10 682 973 ;
+C -1 ; WX 576 ; N sacute ; B 63 -10 523 765 ;
+C -1 ; WX 744 ; N Scircumflex ; B 117 -10 682 953 ;
+C -1 ; WX 576 ; N scircumflex ; B 63 -10 523 741 ;
+C -1 ; WX 744 ; N Scedilla ; B 117 -247 682 700 ;
+C -1 ; WX 576 ; N scedilla ; B 63 -243 523 492 ;
+C -1 ; WX 744 ; N Scaron ; B 117 -10 682 952 ;
+C -1 ; WX 576 ; N scaron ; B 63 -10 523 740 ;
+C -1 ; WX 710 ; N Tcommaaccent ; B 42 -247 668 694 ;
+C -1 ; WX 448 ; N tcommaaccent ; B 34 -243 428 621 ;
+C -1 ; WX 670 ; N Tcaron ; B 42 0 668 952 ;
+C -1 ; WX 448 ; N tcaron ; B 34 -10 508 746 ;
+C -1 ; WX 670 ; N Tbar ; B 42 0 668 694 ;
+C -1 ; WX 448 ; N tbar ; B 34 -10 428 621 ;
+C -1 ; WX 851 ; N Utilde ; B 141 -10 750 916 ;
+C -1 ; WX 656 ; N utilde ; B 87 -10 585 705 ;
+C -1 ; WX 851 ; N Umacron ; B 141 -10 750 829 ;
+C -1 ; WX 654 ; N umacron ; B 88 -10 567 651 ;
+C -1 ; WX 851 ; N Ubreve ; B 141 -10 750 926 ;
+C -1 ; WX 654 ; N ubreve ; B 88 -10 573 714 ;
+C -1 ; WX 851 ; N Uring ; B 141 -10 750 980 ;
+C -1 ; WX 654 ; N uring ; B 88 -10 567 768 ;
+C -1 ; WX 851 ; N Uhungarumlaut ; B 141 -10 793 987 ;
+C -1 ; WX 656 ; N uhungarumlaut ; B 88 -10 660 765 ;
+C -1 ; WX 851 ; N Uogonek ; B 141 -266 750 694 ;
+C -1 ; WX 656 ; N uogonek ; B 88 -265 573 482 ;
+C -1 ; WX 1172 ; N Wcircumflex ; B 68 0 1157 955 ;
+C -1 ; WX 942 ; N wcircumflex ; B 29 0 931 743 ;
+C -1 ; WX 696 ; N Ycircumflex ; B 49 0 710 953 ;
+C -1 ; WX 592 ; N ycircumflex ; B 24 -259 587 741 ;
+C -1 ; WX 696 ; N Ydieresis ; B 49 0 710 927 ;
+C -1 ; WX 743 ; N Zacute ; B 76 0 714 973 ;
+C -1 ; WX 606 ; N zacute ; B 73 0 533 765 ;
+C -1 ; WX 743 ; N Zdotaccent ; B 76 0 714 893 ;
+C -1 ; WX 606 ; N zdotaccent ; B 73 0 533 694 ;
+C -1 ; WX 743 ; N Zcaron ; B 76 0 714 952 ;
+C -1 ; WX 606 ; N zcaron ; B 73 0 533 740 ;
+C -1 ; WX 689 ; N uni0191 ; B -52 -264 627 694 ;
+C -1 ; WX 480 ; N florin ; B -58 -264 500 698 ;
+C -1 ; WX 903 ; N uni022C ; B 105 -7 837 1053 ;
+C -1 ; WX 671 ; N uni022D ; B 63 -10 608 839 ;
+C -1 ; WX 295 ; N uni0237 ; B 9 -266 215 482 ;
+C -1 ; WX 722 ; N circumflex ; B 188 541 507 782 ;
+C -1 ; WX 526 ; N caron ; B 101 520 420 760 ;
+C -1 ; WX 526 ; N breve ; B 47 528 483 734 ;
+C -1 ; WX 585 ; N dotaccent ; B 217 582 359 724 ;
+C -1 ; WX 529 ; N ring ; B 156 529 411 788 ;
+C -1 ; WX 529 ; N ogonek ; B 205 -286 477 95 ;
+C -1 ; WX 683 ; N tilde ; B 124 313 583 514 ;
+C -1 ; WX 806 ; N hungarumlaut ; B 106 533 691 811 ;
+C -1 ; WX 407 ; N uni02EE ; B 34 509 354 758 ;
+C -1 ; WX 722 ; N uni0302 ; B 188 541 507 782 ;
+C -1 ; WX 775 ; N uni1E02 ; B 142 0 714 927 ;
+C -1 ; WX 657 ; N uni1E03 ; B 93 -10 595 927 ;
+C -1 ; WX 864 ; N uni1E0A ; B 142 0 786 927 ;
+C -1 ; WX 660 ; N uni1E0B ; B 63 -10 567 927 ;
+C -1 ; WX 689 ; N uni1E1E ; B 142 0 624 927 ;
+C -1 ; WX 480 ; N uni1E1F ; B 66 0 496 893 ;
+C -1 ; WX 1000 ; N uni1E40 ; B 142 0 897 927 ;
+C -1 ; WX 964 ; N uni1E41 ; B 88 0 877 694 ;
+C -1 ; WX 733 ; N uni1E56 ; B 142 0 682 927 ;
+C -1 ; WX 654 ; N uni1E57 ; B 88 -259 592 694 ;
+C -1 ; WX 744 ; N uni1E60 ; B 117 -10 682 927 ;
+C -1 ; WX 576 ; N uni1E61 ; B 63 -10 523 694 ;
+C -1 ; WX 670 ; N uni1E6A ; B 42 0 668 927 ;
+C -1 ; WX 448 ; N uni1E6B ; B 34 -10 428 792 ;
+C -1 ; WX 1172 ; N Wgrave ; B 68 0 1157 949 ;
+C -1 ; WX 942 ; N wgrave ; B 29 0 931 765 ;
+C -1 ; WX 1172 ; N Wacute ; B 68 0 1157 949 ;
+C -1 ; WX 942 ; N wacute ; B 29 0 931 765 ;
+C -1 ; WX 1172 ; N Wdieresis ; B 68 0 1157 927 ;
+C -1 ; WX 942 ; N wdieresis ; B 29 0 931 694 ;
+C -1 ; WX 696 ; N Ygrave ; B 49 0 710 949 ;
+C -1 ; WX 592 ; N ygrave ; B 24 -259 587 765 ;
+C -1 ; WX 605 ; N endash ; B 0 268 606 375 ;
+C -1 ; WX 715 ; N emdash ; B 0 268 716 375 ;
+C -1 ; WX 821 ; N afii00208 ; B 0 268 821 375 ;
+C -1 ; WX 219 ; N quoteleft ; B 17 506 227 758 ;
+C -1 ; WX 219 ; N quoteright ; B -7 506 203 758 ;
+C -1 ; WX 219 ; N quotesinglbase ; B -7 -125 203 126 ;
+C -1 ; WX 219 ; N quotereversed ; B 17 506 227 758 ;
+C -1 ; WX 405 ; N quotedblleft ; B -7 506 388 758 ;
+C -1 ; WX 405 ; N quotedblright ; B -7 506 388 758 ;
+C -1 ; WX 405 ; N quotedblbase ; B -7 -127 388 125 ;
+C -1 ; WX 405 ; N uni201F ; B 17 506 413 758 ;
+C -1 ; WX 459 ; N dagger ; B 63 52 397 758 ;
+C -1 ; WX 459 ; N daggerdbl ; B 63 -137 397 758 ;
+C -1 ; WX 680 ; N bullet ; B 173 170 507 504 ;
+C -1 ; WX 839 ; N ellipsis ; B 68 -20 762 123 ;
+C -1 ; WX 937 ; N perthousand ; B 3 -20 904 714 ;
+C -1 ; WX 197 ; N minute ; B 34 509 164 758 ;
+C -1 ; WX 395 ; N second ; B 34 509 362 758 ;
+C -1 ; WX 593 ; N uni2034 ; B 34 509 560 758 ;
+C -1 ; WX 197 ; N uni2035 ; B 11 506 187 758 ;
+C -1 ; WX 296 ; N guilsinglleft ; B 12 106 292 502 ;
+C -1 ; WX 296 ; N guilsinglright ; B 5 106 284 502 ;
+C -1 ; WX 634 ; N exclamdbl ; B 90 -20 545 714 ;
+C -1 ; WX 510 ; N uni203D ; B 23 -20 448 722 ;
+C -1 ; WX 505 ; N fraction ; B -25 -20 531 714 ;
+C -1 ; WX 647 ; N uni204B ; B 92 -20 624 758 ;
+C -1 ; WX 651 ; N Euro ; B 4 -30 638 719 ;
+C -1 ; WX 695 ; N trademark ; B 42 448 629 750 ;
+C -1 ; WX 680 ; N H18533 ; B 102 99 578 575 ;
+C -1 ; WX 863 ; N uniFB00 ; B 47 0 868 698 ;
+C -1 ; WX 776 ; N uniFB01 ; B 66 0 696 698 ;
+C -1 ; WX 772 ; N uniFB02 ; B 66 -10 760 698 ;
+C -1 ; WX 1132 ; N uniFB03 ; B 66 0 1066 698 ;
+C -1 ; WX 1162 ; N uniFB04 ; B 66 -10 1150 698 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
new file mode 100644
index 00000000000..6847498d0a6
--- /dev/null
+++ b/Master/texmf-dist/fonts/afm/public/cantarell/Cantarell-Regular.afm
@@ -0,0 +1,415 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20110222
+Comment Creation Date: Wed Apr 6 02:42:31 2011
+FontName Cantarell-Regular
+FullName Cantarell Regular
+FamilyName Cantarell
+Weight Regular
+Notice (Copyright (c) 2009-2011, Understanding Limited (dave@understandinglimited.com),)
+Comment Copyright (c) 2010-2011, Jakub Steiner (jimmac@gmail.com).
+Comment
+Comment This Font Software is licensed under the SIL Open Font License, Version 1.1.
+Comment This license is copied below, and is also available with a FAQ at:
+Comment http://scripts.sil.org/OFL
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -113
+UnderlineThickness 56
+Version 0.0.6
+EncodingScheme ISO10646-1
+FontBBox -61 -278 982 1058
+CapHeight 694
+XHeight 482
+Ascender 671
+Descender -261
+StartCharMetrics 388
+C 32 ; WX 273 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 317 ; N exclam ; B 110 0 208 694 ;
+C 34 ; WX 388 ; N quotedbl ; B 54 529 334 738 ;
+C 35 ; WX 684 ; N numbersign ; B 22 -15 663 694 ;
+C 36 ; WX 585 ; N dollar ; B 111 -32 485 738 ;
+C 37 ; WX 648 ; N percent ; B 42 0 598 694 ;
+C 38 ; WX 775 ; N ampersand ; B 87 -23 729 704 ;
+C 39 ; WX 197 ; N quotesingle ; B 54 529 144 738 ;
+C 40 ; WX 362 ; N parenleft ; B 107 -199 323 756 ;
+C 41 ; WX 362 ; N parenright ; B 39 -199 255 756 ;
+C 42 ; WX 583 ; N asterisk ; B 88 270 496 693 ;
+C 43 ; WX 683 ; N plus ; B 61 41 623 602 ;
+C 44 ; WX 278 ; N comma ; B 21 -107 186 83 ;
+C 45 ; WX 400 ; N hyphen ; B 55 288 345 355 ;
+C 46 ; WX 278 ; N period ; B 88 0 190 103 ;
+C 47 ; WX 354 ; N slash ; B 20 -44 345 694 ;
+C 48 ; WX 634 ; N zero ; B 53 -10 582 704 ;
+C 49 ; WX 634 ; N one ; B 122 0 547 694 ;
+C 50 ; WX 634 ; N two ; B 97 0 553 700 ;
+C 51 ; WX 634 ; N three ; B 86 -22 536 702 ;
+C 52 ; WX 634 ; N four ; B 59 0 576 694 ;
+C 53 ; WX 634 ; N five ; B 84 -11 556 694 ;
+C 54 ; WX 634 ; N six ; B 82 -12 551 700 ;
+C 55 ; WX 634 ; N seven ; B 64 0 571 694 ;
+C 56 ; WX 634 ; N eight ; B 73 -10 562 703 ;
+C 57 ; WX 634 ; N nine ; B 83 -8 553 704 ;
+C 58 ; WX 278 ; N colon ; B 88 0 190 485 ;
+C 59 ; WX 278 ; N semicolon ; B 21 -107 190 485 ;
+C 60 ; WX 523 ; N less ; B 49 59 475 551 ;
+C 61 ; WX 683 ; N equal ; B 107 171 576 466 ;
+C 62 ; WX 523 ; N greater ; B 49 59 475 551 ;
+C 63 ; WX 510 ; N question ; B 49 0 428 702 ;
+C 64 ; WX 1025 ; N at ; B 77 -199 964 684 ;
+C 65 ; WX 648 ; N A ; B 30 0 618 694 ;
+C 66 ; WX 632 ; N B ; B 90 0 582 694 ;
+C 67 ; WX 692 ; N C ; B 108 -10 662 697 ;
+C 68 ; WX 762 ; N D ; B 126 0 705 693 ;
+C 69 ; WX 556 ; N E ; B 90 0 496 694 ;
+C 70 ; WX 551 ; N F ; B 90 0 491 694 ;
+C 71 ; WX 758 ; N G ; B 94 -10 694 700 ;
+C 72 ; WX 740 ; N H ; B 90 0 650 692 ;
+C 73 ; WX 328 ; N I ; B 140 0 224 694 ;
+C 74 ; WX 449 ; N J ; B 48 -9 358 693 ;
+C 75 ; WX 673 ; N K ; B 127 0 639 694 ;
+C 76 ; WX 537 ; N L ; B 127 0 522 694 ;
+C 77 ; WX 855 ; N M ; B 90 0 765 694 ;
+C 78 ; WX 746 ; N N ; B 90 0 656 694 ;
+C 79 ; WX 811 ; N O ; B 90 -8 748 700 ;
+C 80 ; WX 633 ; N P ; B 127 0 588 694 ;
+C 81 ; WX 816 ; N Q ; B 94 -27 762 702 ;
+C 82 ; WX 634 ; N R ; B 90 0 588 694 ;
+C 83 ; WX 599 ; N S ; B 60 -9 539 700 ;
+C 84 ; WX 585 ; N T ; B 37 0 584 694 ;
+C 85 ; WX 709 ; N U ; B 90 -10 619 694 ;
+C 86 ; WX 647 ; N V ; B 30 0 617 694 ;
+C 87 ; WX 1005 ; N W ; B 25 0 980 694 ;
+C 88 ; WX 660 ; N X ; B 48 0 648 694 ;
+C 89 ; WX 609 ; N Y ; B 44 0 593 694 ;
+C 90 ; WX 652 ; N Z ; B 68 0 627 694 ;
+C 91 ; WX 370 ; N bracketleft ; B 122 -200 346 738 ;
+C 92 ; WX 354 ; N backslash ; B 10 -44 335 694 ;
+C 93 ; WX 370 ; N bracketright ; B 24 -200 248 738 ;
+C 94 ; WX 722 ; N asciicircum ; B 186 537 512 752 ;
+C 95 ; WX 566 ; N underscore ; B 73 0 493 73 ;
+C 96 ; WX 547 ; N grave ; B 134 570 415 774 ;
+C 97 ; WX 491 ; N a ; B 45 -12 427 489 ;
+C 98 ; WX 553 ; N b ; B 65 -9 498 671 ;
+C 99 ; WX 467 ; N c ; B 56 -11 427 492 ;
+C 100 ; WX 576 ; N d ; B 56 -9 489 671 ;
+C 101 ; WX 523 ; N e ; B 59 -9 477 490 ;
+C 102 ; WX 372 ; N f ; B 25 0 372 698 ;
+C 103 ; WX 542 ; N g ; B 62 -265 486 492 ;
+C 104 ; WX 520 ; N h ; B 60 0 460 670 ;
+C 105 ; WX 202 ; N i ; B 60 0 142 669 ;
+C 106 ; WX 237 ; N j ; B 5 -263 165 669 ;
+C 107 ; WX 503 ; N k ; B 68 0 470 672 ;
+C 108 ; WX 263 ; N l ; B 54 -10 256 671 ;
+C 109 ; WX 783 ; N m ; B 60 0 723 493 ;
+C 110 ; WX 548 ; N n ; B 60 0 488 492 ;
+C 111 ; WX 569 ; N o ; B 46 -10 510 490 ;
+C 112 ; WX 568 ; N p ; B 87 -261 521 491 ;
+C 113 ; WX 564 ; N q ; B 49 -261 483 491 ;
+C 114 ; WX 391 ; N r ; B 88 0 364 490 ;
+C 115 ; WX 497 ; N s ; B 79 -10 441 488 ;
+C 116 ; WX 387 ; N t ; B 25 -9 347 607 ;
+C 117 ; WX 521 ; N u ; B 60 -12 457 480 ;
+C 118 ; WX 492 ; N v ; B 22 0 470 484 ;
+C 119 ; WX 817 ; N w ; B 27 0 791 482 ;
+C 120 ; WX 511 ; N x ; B 32 0 478 482 ;
+C 121 ; WX 507 ; N y ; B 22 -259 481 482 ;
+C 122 ; WX 526 ; N z ; B 73 0 453 482 ;
+C 123 ; WX 389 ; N braceleft ; B 44 -201 362 738 ;
+C 124 ; WX 431 ; N bar ; B 176 -150 256 782 ;
+C 125 ; WX 389 ; N braceright ; B 27 -201 346 738 ;
+C 126 ; WX 515 ; N asciitilde ; B 80 281 435 431 ;
+C 160 ; WX 273 ; N uni00A0 ; B 0 0 0 0 ;
+C 161 ; WX 317 ; N exclamdown ; B 110 -200 208 645 ;
+C 162 ; WX 498 ; N cent ; B 73 -32 442 738 ;
+C 163 ; WX 634 ; N sterling ; B 74 0 561 699 ;
+C 164 ; WX 634 ; N currency ; B 90 135 544 589 ;
+C 165 ; WX 634 ; N yen ; B 70 0 565 694 ;
+C 166 ; WX 431 ; N brokenbar ; B 176 -150 256 782 ;
+C 167 ; WX 554 ; N section ; B 78 -10 476 700 ;
+C 168 ; WX 585 ; N dieresis ; B 138 603 448 693 ;
+C 169 ; WX 859 ; N copyright ; B 83 -7 776 674 ;
+C 170 ; WX 374 ; N ordfeminine ; B 85 362 303 654 ;
+C 171 ; WX 457 ; N guillemotleft ; B 37 126 433 482 ;
+C 172 ; WX 683 ; N logicalnot ; B 61 138 623 357 ;
+C 173 ; WX 524 ; N uni00AD ; B 107 288 417 355 ;
+C 174 ; WX 601 ; N registered ; B 44 256 558 762 ;
+C 175 ; WX 683 ; N macron ; B 139 728 544 801 ;
+C 176 ; WX 287 ; N degree ; B 37 493 251 712 ;
+C 177 ; WX 683 ; N plusminus ; B 107 73 576 694 ;
+C 178 ; WX 390 ; N uni00B2 ; B 63 370 307 744 ;
+C 179 ; WX 390 ; N uni00B3 ; B 61 366 302 743 ;
+C 180 ; WX 547 ; N acute ; B 134 570 414 774 ;
+C 181 ; WX 579 ; N uni00B5 ; B 93 -200 492 482 ;
+C 182 ; WX 653 ; N paragraph ; B 63 0 561 738 ;
+C 183 ; WX 288 ; N periodcentered ; B 93 307 195 409 ;
+C 184 ; WX 537 ; N cedilla ; B 188 -243 400 11 ;
+C 185 ; WX 265 ; N uni00B9 ; B 29 371 167 738 ;
+C 186 ; WX 372 ; N ordmasculine ; B 33 367 339 742 ;
+C 187 ; WX 457 ; N guillemotright ; B 24 126 420 482 ;
+C 188 ; WX 864 ; N onequarter ; B 73 0 808 694 ;
+C 189 ; WX 877 ; N onehalf ; B 73 0 824 694 ;
+C 190 ; WX 903 ; N threequarters ; B 61 0 848 708 ;
+C 191 ; WX 511 ; N questiondown ; B 62 -69 441 693 ;
+C 192 ; WX 648 ; N Agrave ; B 30 0 618 942 ;
+C 193 ; WX 648 ; N Aacute ; B 30 0 618 942 ;
+C 194 ; WX 648 ; N Acircumflex ; B 30 0 618 939 ;
+C 195 ; WX 648 ; N Atilde ; B 30 0 618 917 ;
+C 196 ; WX 648 ; N Adieresis ; B 30 0 618 926 ;
+C 197 ; WX 648 ; N Aring ; B 30 0 618 914 ;
+C 198 ; WX 935 ; N AE ; B 63 0 857 694 ;
+C 199 ; WX 692 ; N Ccedilla ; B 108 -248 662 697 ;
+C 200 ; WX 556 ; N Egrave ; B 90 0 496 941 ;
+C 201 ; WX 556 ; N Eacute ; B 90 0 496 941 ;
+C 202 ; WX 556 ; N Ecircumflex ; B 90 0 496 943 ;
+C 203 ; WX 556 ; N Edieresis ; B 90 0 496 926 ;
+C 204 ; WX 328 ; N Igrave ; B 51 0 333 941 ;
+C 205 ; WX 328 ; N Iacute ; B 9 0 290 942 ;
+C 206 ; WX 328 ; N Icircumflex ; B 7 0 334 939 ;
+C 207 ; WX 327 ; N Idieresis ; B 43 0 323 891 ;
+C 208 ; WX 783 ; N Eth ; B 57 0 729 694 ;
+C 209 ; WX 746 ; N Ntilde ; B 90 0 656 917 ;
+C 210 ; WX 811 ; N Ograve ; B 90 -8 748 943 ;
+C 211 ; WX 811 ; N Oacute ; B 90 -8 748 942 ;
+C 212 ; WX 811 ; N Ocircumflex ; B 90 -8 748 939 ;
+C 213 ; WX 811 ; N Otilde ; B 90 -8 748 917 ;
+C 214 ; WX 811 ; N Odieresis ; B 90 -8 748 926 ;
+C 215 ; WX 634 ; N multiply ; B 89 91 544 540 ;
+C 216 ; WX 857 ; N Oslash ; B 75 -7 791 702 ;
+C 217 ; WX 709 ; N Ugrave ; B 90 -10 619 941 ;
+C 218 ; WX 709 ; N Uacute ; B 90 -10 619 942 ;
+C 219 ; WX 709 ; N Ucircumflex ; B 90 -10 619 939 ;
+C 220 ; WX 709 ; N Udieresis ; B 90 -10 619 926 ;
+C 221 ; WX 609 ; N Yacute ; B 44 0 593 942 ;
+C 222 ; WX 647 ; N Thorn ; B 142 0 604 694 ;
+C 223 ; WX 615 ; N germandbls ; B 98 -13 557 698 ;
+C 224 ; WX 491 ; N agrave ; B 45 -12 427 756 ;
+C 225 ; WX 491 ; N aacute ; B 45 -12 427 756 ;
+C 226 ; WX 491 ; N acircumflex ; B 45 -12 427 727 ;
+C 227 ; WX 491 ; N atilde ; B 45 -12 446 704 ;
+C 228 ; WX 491 ; N adieresis ; B 45 -12 427 693 ;
+C 229 ; WX 491 ; N aring ; B 45 -12 427 768 ;
+C 230 ; WX 817 ; N ae ; B 60 -10 754 491 ;
+C 231 ; WX 467 ; N ccedilla ; B 56 -248 427 492 ;
+C 232 ; WX 523 ; N egrave ; B 59 -9 477 756 ;
+C 233 ; WX 523 ; N eacute ; B 59 -9 477 756 ;
+C 234 ; WX 523 ; N ecircumflex ; B 59 -9 477 731 ;
+C 235 ; WX 523 ; N edieresis ; B 59 -9 477 693 ;
+C 236 ; WX 255 ; N igrave ; B -5 0 218 756 ;
+C 237 ; WX 255 ; N iacute ; B 55 0 277 756 ;
+C 238 ; WX 255 ; N icircumflex ; B -31 0 295 727 ;
+C 239 ; WX 255 ; N idieresis ; B -7 0 263 694 ;
+C 240 ; WX 611 ; N eth ; B 62 -10 523 712 ;
+C 241 ; WX 548 ; N ntilde ; B 60 0 488 709 ;
+C 242 ; WX 569 ; N ograve ; B 46 -10 510 756 ;
+C 243 ; WX 569 ; N oacute ; B 46 -10 510 756 ;
+C 244 ; WX 569 ; N ocircumflex ; B 46 -10 510 727 ;
+C 245 ; WX 569 ; N otilde ; B 46 -10 510 709 ;
+C 246 ; WX 569 ; N odieresis ; B 46 -10 510 693 ;
+C 247 ; WX 683 ; N divide ; B 61 41 623 602 ;
+C 248 ; WX 569 ; N oslash ; B 38 -10 521 490 ;
+C 249 ; WX 521 ; N ugrave ; B 60 -12 457 756 ;
+C 250 ; WX 521 ; N uacute ; B 60 -12 457 756 ;
+C 251 ; WX 521 ; N ucircumflex ; B 60 -12 457 745 ;
+C 252 ; WX 521 ; N udieresis ; B 60 -12 457 693 ;
+C 253 ; WX 507 ; N yacute ; B 22 -259 481 756 ;
+C 254 ; WX 596 ; N thorn ; B 93 -259 533 694 ;
+C 255 ; WX 507 ; N ydieresis ; B 22 -259 481 693 ;
+C -1 ; WX 648 ; N Amacron ; B 30 0 618 829 ;
+C -1 ; WX 491 ; N amacron ; B 45 -12 427 651 ;
+C -1 ; WX 648 ; N Abreve ; B 30 0 618 919 ;
+C -1 ; WX 491 ; N abreve ; B 45 -12 466 707 ;
+C -1 ; WX 675 ; N Aogonek ; B 63 -267 651 694 ;
+C -1 ; WX 521 ; N aogonek ; B 59 -266 434 485 ;
+C -1 ; WX 692 ; N Cacute ; B 108 -10 662 965 ;
+C -1 ; WX 467 ; N cacute ; B 56 -11 427 756 ;
+C -1 ; WX 692 ; N Ccircumflex ; B 108 -10 662 943 ;
+C -1 ; WX 467 ; N ccircumflex ; B 56 -11 427 731 ;
+C -1 ; WX 692 ; N Cdotaccent ; B 108 -10 662 894 ;
+C -1 ; WX 467 ; N cdotaccent ; B 56 -11 427 695 ;
+C -1 ; WX 692 ; N Ccaron ; B 108 -10 662 976 ;
+C -1 ; WX 467 ; N ccaron ; B 56 -11 438 762 ;
+C -1 ; WX 762 ; N Dcaron ; B 126 0 705 976 ;
+C -1 ; WX 695 ; N dcaron ; B 56 -9 671 738 ;
+C -1 ; WX 783 ; N Dcroat ; B 57 0 729 694 ;
+C -1 ; WX 604 ; N dcroat ; B 56 -9 561 671 ;
+C -1 ; WX 556 ; N Emacron ; B 90 0 496 829 ;
+C -1 ; WX 523 ; N emacron ; B 59 -9 477 651 ;
+C -1 ; WX 556 ; N Ebreve ; B 90 0 496 919 ;
+C -1 ; WX 523 ; N ebreve ; B 59 -9 502 707 ;
+C -1 ; WX 556 ; N Edotaccent ; B 90 0 496 894 ;
+C -1 ; WX 523 ; N edotaccent ; B 59 -9 477 695 ;
+C -1 ; WX 626 ; N Eogonek ; B 142 -265 548 694 ;
+C -1 ; WX 538 ; N eogonek ; B 63 -266 475 488 ;
+C -1 ; WX 556 ; N Ecaron ; B 90 0 496 976 ;
+C -1 ; WX 523 ; N ecaron ; B 59 -9 477 764 ;
+C -1 ; WX 758 ; N Gcircumflex ; B 94 -10 694 943 ;
+C -1 ; WX 542 ; N gcircumflex ; B 62 -265 486 731 ;
+C -1 ; WX 758 ; N Gbreve ; B 94 -10 694 919 ;
+C -1 ; WX 542 ; N gbreve ; B 62 -265 501 707 ;
+C -1 ; WX 758 ; N Gdotaccent ; B 94 -10 694 894 ;
+C -1 ; WX 542 ; N gdotaccent ; B 62 -265 486 695 ;
+C -1 ; WX 758 ; N Gcommaaccent ; B 94 -259 694 700 ;
+C -1 ; WX 542 ; N gcommaaccent ; B 62 -266 486 755 ;
+C -1 ; WX 740 ; N Hcircumflex ; B 90 0 650 945 ;
+C -1 ; WX 520 ; N hcircumflex ; B 60 0 460 945 ;
+C -1 ; WX 740 ; N Hbar ; B 40 0 724 692 ;
+C -1 ; WX 520 ; N hbar ; B 16 0 460 670 ;
+C -1 ; WX 328 ; N Itilde ; B 19 0 334 912 ;
+C -1 ; WX 255 ; N itilde ; B -29 -4 285 696 ;
+C -1 ; WX 328 ; N Imacron ; B 82 0 283 829 ;
+C -1 ; WX 255 ; N imacron ; B 39 0 217 651 ;
+C -1 ; WX 328 ; N Ibreve ; B 4 0 318 915 ;
+C -1 ; WX 255 ; N ibreve ; B -18 0 296 701 ;
+C -1 ; WX 356 ; N Iogonek ; B 15 -267 241 694 ;
+C -1 ; WX 255 ; N iogonek ; B -61 -271 175 694 ;
+C -1 ; WX 328 ; N Idotaccent ; B 130 0 233 894 ;
+C -1 ; WX 255 ; N dotlessi ; B 88 0 168 482 ;
+C -1 ; WX 821 ; N IJ ; B 140 -9 714 694 ;
+C -1 ; WX 511 ; N ij ; B 60 -263 421 669 ;
+C -1 ; WX 449 ; N Jcircumflex ; B 48 -9 451 943 ;
+C -1 ; WX 255 ; N jcircumflex ; B 0 -263 263 731 ;
+C -1 ; WX 673 ; N Kcommaaccent ; B 127 -250 639 694 ;
+C -1 ; WX 503 ; N kcommaaccent ; B 68 -250 470 672 ;
+C -1 ; WX 523 ; N kgreenlandic ; B 88 0 489 482 ;
+C -1 ; WX 537 ; N Lacute ; B 123 0 522 965 ;
+C -1 ; WX 263 ; N lacute ; B 54 -10 358 1002 ;
+C -1 ; WX 537 ; N Lcommaaccent ; B 126 -250 522 694 ;
+C -1 ; WX 263 ; N lcommaaccent ; B 35 -250 256 671 ;
+C -1 ; WX 537 ; N Lcaron ; B 127 0 522 694 ;
+C -1 ; WX 393 ; N lcaron ; B 54 -11 369 738 ;
+C -1 ; WX 537 ; N Ldot ; B 127 0 522 694 ;
+C -1 ; WX 402 ; N ldot ; B 54 -10 363 671 ;
+C -1 ; WX 537 ; N Lslash ; B 56 0 522 694 ;
+C -1 ; WX 335 ; N lslash ; B 44 -10 296 671 ;
+C -1 ; WX 746 ; N Nacute ; B 90 0 656 965 ;
+C -1 ; WX 548 ; N nacute ; B 60 0 488 755 ;
+C -1 ; WX 746 ; N Ncommaaccent ; B 90 -250 656 694 ;
+C -1 ; WX 548 ; N ncommaaccent ; B 60 -250 488 492 ;
+C -1 ; WX 746 ; N Ncaron ; B 90 0 656 976 ;
+C -1 ; WX 548 ; N ncaron ; B 60 0 488 766 ;
+C -1 ; WX 659 ; N napostrophe ; B 36 0 571 694 ;
+C -1 ; WX 804 ; N Eng ; B 142 -180 702 724 ;
+C -1 ; WX 574 ; N eng ; B 88 -169 486 493 ;
+C -1 ; WX 811 ; N Omacron ; B 90 -8 748 829 ;
+C -1 ; WX 569 ; N omacron ; B 46 -10 510 651 ;
+C -1 ; WX 811 ; N Obreve ; B 90 -8 748 919 ;
+C -1 ; WX 569 ; N obreve ; B 46 -10 510 707 ;
+C -1 ; WX 811 ; N Ohungarumlaut ; B 90 -8 748 975 ;
+C -1 ; WX 569 ; N ohungarumlaut ; B 46 -10 551 756 ;
+C -1 ; WX 975 ; N OE ; B 104 0 897 694 ;
+C -1 ; WX 880 ; N oe ; B 63 -11 817 489 ;
+C -1 ; WX 634 ; N Racute ; B 90 0 588 965 ;
+C -1 ; WX 391 ; N racute ; B 88 0 364 756 ;
+C -1 ; WX 634 ; N Rcommaaccent ; B 90 -250 588 694 ;
+C -1 ; WX 391 ; N rcommaaccent ; B 13 -250 364 490 ;
+C -1 ; WX 634 ; N Rcaron ; B 90 0 588 976 ;
+C -1 ; WX 391 ; N rcaron ; B 82 0 408 764 ;
+C -1 ; WX 599 ; N Sacute ; B 60 -9 539 965 ;
+C -1 ; WX 497 ; N sacute ; B 79 -10 441 756 ;
+C -1 ; WX 599 ; N Scircumflex ; B 60 -9 539 943 ;
+C -1 ; WX 497 ; N scircumflex ; B 79 -10 441 731 ;
+C -1 ; WX 599 ; N Scedilla ; B 60 -248 539 700 ;
+C -1 ; WX 497 ; N scedilla ; B 79 -243 441 488 ;
+C -1 ; WX 599 ; N Scaron ; B 60 -9 539 976 ;
+C -1 ; WX 497 ; N scaron ; B 79 -10 441 764 ;
+C -1 ; WX 590 ; N Tcommaaccent ; B 42 -251 588 694 ;
+C -1 ; WX 387 ; N tcommaaccent ; B 25 -244 347 607 ;
+C -1 ; WX 585 ; N Tcaron ; B 37 0 584 976 ;
+C -1 ; WX 387 ; N tcaron ; B 25 -9 398 746 ;
+C -1 ; WX 585 ; N Tbar ; B 37 0 584 694 ;
+C -1 ; WX 387 ; N tbar ; B 8 -9 347 607 ;
+C -1 ; WX 709 ; N Utilde ; B 90 -10 619 910 ;
+C -1 ; WX 521 ; N utilde ; B 60 -12 491 696 ;
+C -1 ; WX 709 ; N Umacron ; B 90 -10 619 829 ;
+C -1 ; WX 521 ; N umacron ; B 26 -12 457 651 ;
+C -1 ; WX 709 ; N Ubreve ; B 90 -10 619 923 ;
+C -1 ; WX 521 ; N ubreve ; B 60 -12 457 709 ;
+C -1 ; WX 709 ; N Uring ; B 90 -10 619 980 ;
+C -1 ; WX 521 ; N uring ; B 60 -12 457 768 ;
+C -1 ; WX 709 ; N Uhungarumlaut ; B 90 -10 666 970 ;
+C -1 ; WX 521 ; N uhungarumlaut ; B 8 -12 457 756 ;
+C -1 ; WX 771 ; N Uogonek ; B 141 -267 669 694 ;
+C -1 ; WX 576 ; N uogonek ; B 88 -266 489 482 ;
+C -1 ; WX 1005 ; N Wcircumflex ; B 25 0 980 945 ;
+C -1 ; WX 817 ; N wcircumflex ; B 27 0 791 733 ;
+C -1 ; WX 609 ; N Ycircumflex ; B 44 0 593 943 ;
+C -1 ; WX 507 ; N ycircumflex ; B 22 -259 481 731 ;
+C -1 ; WX 609 ; N Ydieresis ; B 44 0 593 926 ;
+C -1 ; WX 652 ; N Zacute ; B 68 0 627 965 ;
+C -1 ; WX 526 ; N zacute ; B 73 0 453 756 ;
+C -1 ; WX 652 ; N Zdotaccent ; B 68 0 627 894 ;
+C -1 ; WX 526 ; N zdotaccent ; B 73 0 453 694 ;
+C -1 ; WX 652 ; N Zcaron ; B 68 0 627 976 ;
+C -1 ; WX 526 ; N zcaron ; B 73 0 453 764 ;
+C -1 ; WX 609 ; N uni0191 ; B -52 -275 543 694 ;
+C -1 ; WX 400 ; N florin ; B -58 -278 413 698 ;
+C -1 ; WX 811 ; N uni022C ; B 90 -8 748 1058 ;
+C -1 ; WX 255 ; N uni0237 ; B 8 -263 168 482 ;
+C -1 ; WX 722 ; N circumflex ; B 216 570 479 752 ;
+C -1 ; WX 526 ; N caron ; B 95 549 421 764 ;
+C -1 ; WX 526 ; N breve ; B 72 548 454 707 ;
+C -1 ; WX 585 ; N dotaccent ; B 237 602 339 705 ;
+C -1 ; WX 529 ; N ring ; B 177 549 391 768 ;
+C -1 ; WX 529 ; N ogonek ; B 223 -267 453 70 ;
+C -1 ; WX 683 ; N tilde ; B 149 604 554 753 ;
+C -1 ; WX 806 ; N hungarumlaut ; B 139 561 664 784 ;
+C -1 ; WX 407 ; N uni02EE ; B 54 529 334 738 ;
+C -1 ; WX 722 ; N uni0302 ; B 186 537 512 752 ;
+C -1 ; WX 632 ; N uni1E02 ; B 90 0 582 928 ;
+C -1 ; WX 553 ; N uni1E03 ; B 65 -9 498 928 ;
+C -1 ; WX 762 ; N uni1E0A ; B 126 0 705 928 ;
+C -1 ; WX 576 ; N uni1E0B ; B 56 -9 489 928 ;
+C -1 ; WX 551 ; N uni1E1E ; B 90 0 491 928 ;
+C -1 ; WX 372 ; N uni1E1F ; B 25 0 372 894 ;
+C -1 ; WX 855 ; N uni1E40 ; B 90 0 765 928 ;
+C -1 ; WX 783 ; N uni1E41 ; B 60 0 723 695 ;
+C -1 ; WX 633 ; N uni1E56 ; B 127 0 588 928 ;
+C -1 ; WX 568 ; N uni1E57 ; B 87 -261 521 695 ;
+C -1 ; WX 599 ; N uni1E60 ; B 60 -9 539 928 ;
+C -1 ; WX 497 ; N uni1E61 ; B 79 -10 441 695 ;
+C -1 ; WX 585 ; N uni1E6A ; B 37 0 584 928 ;
+C -1 ; WX 387 ; N uni1E6B ; B 25 -9 347 792 ;
+C -1 ; WX 1005 ; N Wgrave ; B 25 0 980 941 ;
+C -1 ; WX 817 ; N wgrave ; B 27 0 791 756 ;
+C -1 ; WX 1005 ; N Wacute ; B 25 0 980 941 ;
+C -1 ; WX 817 ; N wacute ; B 27 0 791 756 ;
+C -1 ; WX 1005 ; N Wdieresis ; B 25 0 980 926 ;
+C -1 ; WX 817 ; N wdieresis ; B 27 0 791 694 ;
+C -1 ; WX 609 ; N Ygrave ; B 44 0 593 941 ;
+C -1 ; WX 507 ; N ygrave ; B 22 -259 481 756 ;
+C -1 ; WX 565 ; N endash ; B 0 288 566 355 ;
+C -1 ; WX 675 ; N emdash ; B 0 288 676 355 ;
+C -1 ; WX 781 ; N afii00208 ; B 0 288 781 355 ;
+C -1 ; WX 219 ; N quoteleft ; B 44 482 200 694 ;
+C -1 ; WX 219 ; N quoteright ; B 20 482 176 694 ;
+C -1 ; WX 219 ; N quotesinglbase ; B 20 -105 176 106 ;
+C -1 ; WX 219 ; N quotereversed ; B 44 482 200 694 ;
+C -1 ; WX 405 ; N quotedblleft ; B 20 482 361 694 ;
+C -1 ; WX 405 ; N quotedblright ; B 20 482 361 694 ;
+C -1 ; WX 405 ; N quotedblbase ; B 20 -107 361 104 ;
+C -1 ; WX 405 ; N uni201F ; B 44 482 386 694 ;
+C -1 ; WX 459 ; N dagger ; B 83 72 377 738 ;
+C -1 ; WX 459 ; N daggerdbl ; B 83 -117 377 738 ;
+C -1 ; WX 680 ; N bullet ; B 173 170 507 504 ;
+C -1 ; WX 839 ; N ellipsis ; B 88 0 742 103 ;
+C -1 ; WX 937 ; N perthousand ; B 42 0 884 694 ;
+C -1 ; WX 197 ; N minute ; B 54 529 144 738 ;
+C -1 ; WX 395 ; N second ; B 54 529 342 738 ;
+C -1 ; WX 593 ; N uni2034 ; B 54 529 540 738 ;
+C -1 ; WX 197 ; N uni2035 ; B 34 482 164 694 ;
+C -1 ; WX 275 ; N guilsinglleft ; B 37 126 251 482 ;
+C -1 ; WX 275 ; N guilsinglright ; B 24 126 239 482 ;
+C -1 ; WX 634 ; N exclamdbl ; B 110 0 525 694 ;
+C -1 ; WX 510 ; N interrobang ; B 49 0 428 702 ;
+C -1 ; WX 505 ; N fraction ; B 10 0 496 694 ;
+C -1 ; WX 653 ; N uni204B ; B 92 0 590 738 ;
+C -1 ; WX 651 ; N Euro ; B 24 -10 613 699 ;
+C -1 ; WX 695 ; N trademark ; B 54 460 617 738 ;
+C -1 ; WX 680 ; N H18533 ; B 102 99 578 575 ;
+C -1 ; WX 720 ; N uniFB00 ; B 35 0 682 698 ;
+C -1 ; WX 656 ; N uniFB01 ; B 25 0 542 698 ;
+C -1 ; WX 635 ; N uniFB02 ; B 25 -10 629 698 ;
+C -1 ; WX 932 ; N uniFB03 ; B 66 0 865 698 ;
+C -1 ; WX 991 ; N uniFB04 ; B 59 -10 982 698 ;
+EndCharMetrics
+EndFontMetrics
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc
new file mode 100644
index 00000000000..5edb7ad34a2
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixlatin.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+% author = "See file cantarell-fixlatin.etx",
+% version = "See file cantarell-fixlatin.etx",
+% date = "generated 2011/04/06",
+% filename = "cantarell-fixlatin.enc",
+% email = "See file cantarell-fixlatin.etx",
+% codetable = "ISO/ASCII",
+% checksum = "",
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-fixlatin.etx."
+% }
+
+% Created by: tex cantarell-map
+% Created using: \etxtoenc{cantarell-fixlatin}{cantarell-fixlatin}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{cantarell-fixlatin}{fontinst-autoenc-cantarell-fixlatin}{\download{cantarell-fixlatin.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-cantarell-fixlatin
+/fontinst-autoenc-cantarell-fixlatin [
+% 0
+/dcroat
+/Eng
+/eng
+/Tcommaaccent
+/tcommaaccent
+/uni0237
+/ring
+/endash
+% 8
+/emdash
+/uniFB00
+/uniFB01
+/uniFB02
+/uniFB03
+/uniFB04
+/.notdef
+/.notdef
+% 16
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 24
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 32
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 40
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 48
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 56
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 64
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 72
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 80
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 88
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 96
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 104
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 112
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 120
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 128
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 136
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 144
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 152
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 160
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 168
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 176
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 184
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 192
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 200
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 208
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 216
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 224
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 232
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 240
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 248
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+] def
+%%EndResource
+
+% End of file cantarell-fixlatin.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc
new file mode 100644
index 00000000000..fb64444832b
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-fixtextcomp.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+% author = "See file cantarell-fixtextcomp.etx",
+% version = "See file cantarell-fixtextcomp.etx",
+% date = "generated 2011/04/06",
+% filename = "cantarell-fixtextcomp.enc",
+% email = "See file cantarell-fixtextcomp.etx",
+% codetable = "ISO/ASCII",
+% checksum = "",
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from cantarell-fixtextcomp.etx."
+% }
+
+% Created by: tex cantarell-map
+% Created using: \etxtoenc{cantarell-fixtextcomp}{cantarell-fixtextcomp}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{cantarell-fixtextcomp}{fontinst-autoenc-cantarell-fixtextcomp}{\download{cantarell-fixtextcomp.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-cantarell-fixtextcomp
+/fontinst-autoenc-cantarell-fixtextcomp [
+% 0
+/parenleft
+/asterisk
+/C
+/g
+/bracketleft
+/bracketright
+/grave
+/bar
+% 8
+/asciitilde
+/dieresis
+/macron
+/uni00B2
+/uni00B3
+/acute
+/uni00B5
+/cedilla
+% 16
+/uni00B9
+/circumflex
+/caron
+/breve
+/dotaccent
+/ring
+/ogonek
+/tilde
+% 24
+/hungarumlaut
+/endash
+/quotesinglebase
+/quotedblbase
+/Euro
+/.notdef
+/.notdef
+/.notdef
+% 32
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 40
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 48
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 56
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 64
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 72
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 80
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 88
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 96
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 104
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 112
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 120
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 128
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 136
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 144
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 152
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 160
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 168
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 176
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 184
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 192
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 200
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 208
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 216
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 224
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 232
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 240
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 248
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+] def
+%%EndResource
+
+% End of file cantarell-fixtextcomp.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc
new file mode 100644
index 00000000000..5892e0e0122
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ot1.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+% author = "See file ot1.etx",
+% version = "See file ot1.etx",
+% date = "generated 2011/04/06",
+% filename = "cantarell-ot1.enc",
+% email = "See file ot1.etx",
+% codetable = "ISO/ASCII",
+% checksum = "",
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from ot1.etx."
+% }
+
+% Created by: tex cantarell-map
+% Created using: \etxtoenc{ot1}{cantarell-ot1}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{ot1}{fontinst-autoenc-ot1}{\download{cantarell-ot1.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-ot1
+/fontinst-autoenc-ot1 [
+% 0
+/Gamma
+/Delta
+/Theta
+/Lambda
+/Xi
+/Pi
+/Sigma
+/Upsilon
+% 8
+/Phi
+/Psi
+/Omega
+/ff
+/fi
+/fl
+/ffi
+/ffl
+% 16
+/dotlessi
+/dotlessj
+/grave
+/acute
+/caron
+/breve
+/macron
+/ringfitted
+% 24
+/cedilla
+/germandbls
+/ae
+/oe
+/oslash
+/AE
+/OE
+/Oslash
+% 32
+/lslashslash
+/exclam
+/quotedblright
+/numbersign
+/dollar
+/percent
+/ampersand
+/quoteright
+% 40
+/parenleft
+/parenright
+/asterisk
+/plus
+/comma
+/hyphen
+/period
+/slash
+% 48
+/zero
+/one
+/two
+/three
+/four
+/five
+/six
+/seven
+% 56
+/eight
+/nine
+/colon
+/semicolon
+/exclamdown
+/equal
+/questiondown
+/question
+% 64
+/at
+/A
+/B
+/C
+/D
+/E
+/F
+/G
+% 72
+/H
+/I
+/J
+/K
+/L
+/M
+/N
+/O
+% 80
+/P
+/Q
+/R
+/S
+/T
+/U
+/V
+/W
+% 88
+/X
+/Y
+/Z
+/bracketleft
+/quotedblleft
+/bracketright
+/circumflex
+/dotaccent
+% 96
+/quoteleft
+/a
+/b
+/c
+/d
+/e
+/f
+/g
+% 104
+/h
+/i
+/j
+/k
+/l
+/m
+/n
+/o
+% 112
+/p
+/q
+/r
+/s
+/t
+/u
+/v
+/w
+% 120
+/x
+/y
+/z
+/rangedash
+/punctdash
+/hungarumlaut
+/tilde
+/dieresis
+% 128
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 136
+/.notdef
+/.notdef
+/Lslash
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 144
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 152
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 160
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 168
+/.notdef
+/.notdef
+/lslash
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 176
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 184
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 192
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 200
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 208
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 216
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 224
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 232
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 240
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 248
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+] def
+%%EndResource
+
+% End of file cantarell-ot1.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc
new file mode 100644
index 00000000000..4239cc3c943
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-t1.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+% author = "See file t1.etx",
+% version = "See file t1.etx",
+% date = "generated 2011/04/06",
+% filename = "cantarell-t1.enc",
+% email = "See file t1.etx",
+% codetable = "ISO/ASCII",
+% checksum = "",
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from t1.etx."
+% }
+
+% Created by: tex cantarell-map
+% Created using: \etxtoenc{t1}{cantarell-t1}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{t1}{fontinst-autoenc-t1}{\download{cantarell-t1.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-t1
+/fontinst-autoenc-t1 [
+% 0
+/grave
+/acute
+/circumflex
+/tilde
+/dieresis
+/hungarumlaut
+/ring
+/caron
+% 8
+/breve
+/macron
+/dotaccent
+/cedilla
+/ogonek
+/quotesinglbase
+/guilsinglleft
+/guilsinglright
+% 16
+/quotedblleft
+/quotedblright
+/quotedblbase
+/guillemotleft
+/guillemotright
+/rangedash
+/punctdash
+/compwordmark
+% 24
+/perthousandzero
+/dotlessi
+/dotlessj
+/ff
+/fi
+/fl
+/ffi
+/ffl
+% 32
+/visiblespace
+/exclam
+/quotedbl
+/numbersign
+/dollar
+/percent
+/ampersand
+/quoteright
+% 40
+/parenleft
+/parenright
+/asterisk
+/plus
+/comma
+/hyphen
+/period
+/slash
+% 48
+/zero
+/one
+/two
+/three
+/four
+/five
+/six
+/seven
+% 56
+/eight
+/nine
+/colon
+/semicolon
+/less
+/equal
+/greater
+/question
+% 64
+/at
+/A
+/B
+/C
+/D
+/E
+/F
+/G
+% 72
+/H
+/I
+/J
+/K
+/L
+/M
+/N
+/O
+% 80
+/P
+/Q
+/R
+/S
+/T
+/U
+/V
+/W
+% 88
+/X
+/Y
+/Z
+/bracketleft
+/backslash
+/bracketright
+/asciicircum
+/underscore
+% 96
+/quoteleft
+/a
+/b
+/c
+/d
+/e
+/f
+/g
+% 104
+/h
+/i
+/j
+/k
+/l
+/m
+/n
+/o
+% 112
+/p
+/q
+/r
+/s
+/t
+/u
+/v
+/w
+% 120
+/x
+/y
+/z
+/braceleft
+/bar
+/braceright
+/asciitilde
+/hyphenchar
+% 128
+/Abreve
+/Aogonek
+/Cacute
+/Ccaron
+/Dcaron
+/Ecaron
+/Eogonek
+/Gbreve
+% 136
+/Lacute
+/Lcaron
+/Lslash
+/Nacute
+/Ncaron
+/Ng
+/Ohungarumlaut
+/Racute
+% 144
+/Rcaron
+/Sacute
+/Scaron
+/Scedilla
+/Tcaron
+/Tcedilla
+/Uhungarumlaut
+/Uring
+% 152
+/Ydieresis
+/Zacute
+/Zcaron
+/Zdotaccent
+/IJ
+/Idotaccent
+/dbar
+/section
+% 160
+/abreve
+/aogonek
+/cacute
+/ccaron
+/dcaron
+/ecaron
+/eogonek
+/gbreve
+% 168
+/lacute
+/lcaron
+/lslash
+/nacute
+/ncaron
+/ng
+/ohungarumlaut
+/racute
+% 176
+/rcaron
+/sacute
+/scaron
+/scedilla
+/tcaron
+/tcedilla
+/uhungarumlaut
+/uring
+% 184
+/ydieresis
+/zacute
+/zcaron
+/zdotaccent
+/ij
+/exclamdown
+/questiondown
+/sterling
+% 192
+/Agrave
+/Aacute
+/Acircumflex
+/Atilde
+/Adieresis
+/Aring
+/AE
+/Ccedilla
+% 200
+/Egrave
+/Eacute
+/Ecircumflex
+/Edieresis
+/Igrave
+/Iacute
+/Icircumflex
+/Idieresis
+% 208
+/Eth
+/Ntilde
+/Ograve
+/Oacute
+/Ocircumflex
+/Otilde
+/Odieresis
+/OE
+% 216
+/Oslash
+/Ugrave
+/Uacute
+/Ucircumflex
+/Udieresis
+/Yacute
+/Thorn
+/SS
+% 224
+/agrave
+/aacute
+/acircumflex
+/atilde
+/adieresis
+/aring
+/ae
+/ccedilla
+% 232
+/egrave
+/eacute
+/ecircumflex
+/edieresis
+/igrave
+/iacute
+/icircumflex
+/idieresis
+% 240
+/eth
+/ntilde
+/ograve
+/oacute
+/ocircumflex
+/otilde
+/odieresis
+/oe
+% 248
+/oslash
+/ugrave
+/uacute
+/ucircumflex
+/udieresis
+/yacute
+/thorn
+/germandbls
+] def
+%%EndResource
+
+% End of file cantarell-t1.enc.
diff --git a/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc
new file mode 100644
index 00000000000..c330b5ca0bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/cantarell/cantarell-ts1.enc
@@ -0,0 +1,317 @@
+%!PS-Adobe-3.0 Resource-Encoding
+% @psencodingfile{
+% author = "See file ts1.etx",
+% version = "See file ts1.etx",
+% date = "generated 2011/04/06",
+% filename = "cantarell-ts1.enc",
+% email = "See file ts1.etx",
+% codetable = "ISO/ASCII",
+% checksum = "",
+% abstract = "This is a postscript encoding file, automatically generated by fontinst from ts1.etx."
+% }
+
+% Created by: tex cantarell-map
+% Created using: \etxtoenc{ts1}{cantarell-ts1}
+
+% This file should be installed somewhere that your DVI
+% to postscript driver looks for files. It is needed for
+% reencoding some font you have transformed.
+
+% After installing this file, you should add the following
+% line (minus %) to your finstmsc.rc file:
+% \declarepsencoding{ts1}{fontinst-autoenc-ts1}{\download{cantarell-ts1.enc}}
+
+%%BeginResource: encoding fontinst-autoenc-ts1
+/fontinst-autoenc-ts1 [
+% 0
+/capitalgrave
+/capitalacute
+/capitalcircumflex
+/capitaltilde
+/capitaldieresis
+/capitalhungarumlaut
+/capitalring
+/capitalcaron
+% 8
+/capitalbreve
+/capitalmacron
+/capitaldotaccent
+/cedilla
+/ogonek
+/quotesinglbase
+/.notdef
+/.notdef
+% 16
+/.notdef
+/.notdef
+/quotedblbase
+/.notdef
+/.notdef
+/twelveudash
+/threequartersemdash
+/capitalcompwordmark
+% 24
+/arrowleft
+/arrowright
+/tieaccentlowercase
+/tieaccentcapital
+/newtieaccentlowercase
+/newtieaccentcapital
+/.notdef
+/ascendercompwordmark
+% 32
+/blank
+/.notdef
+/.notdef
+/.notdef
+/dollar
+/.notdef
+/.notdef
+/quotesingle
+% 40
+/.notdef
+/.notdef
+/asteriskcentered
+/.notdef
+/comma
+/hyphendbl
+/period
+/fraction
+% 48
+/zerooldstyle
+/oneoldstyle
+/twooldstyle
+/threeoldstyle
+/fouroldstyle
+/fiveoldstyle
+/sixoldstyle
+/sevenoldstyle
+% 56
+/eightoldstyle
+/nineoldstyle
+/.notdef
+/.notdef
+/angbracketleft
+/minus
+/angbracketright
+/.notdef
+% 64
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 72
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/Omegainv
+/.notdef
+/bigcircle
+% 80
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/Omega
+% 88
+/.notdef
+/.notdef
+/.notdef
+/openbracketleft
+/.notdef
+/openbracketright
+/arrowup
+/arrowdown
+% 96
+/asciigrave
+/.notdef
+/born
+/divorced
+/died
+/.notdef
+/.notdef
+/.notdef
+% 104
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/leaf
+/married
+/musicalnote
+/.notdef
+% 112
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 120
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/tildelow
+/hyphendblchar
+% 128
+/asciibreve
+/asciicaron
+/asciiacutedbl
+/asciigravedbl
+/dagger
+/daggerdbl
+/bardbl
+/perthousand
+% 136
+/bullet
+/centigrade
+/dollaroldstyle
+/centoldstyle
+/florin
+/colonmonetary
+/won
+/naira
+% 144
+/guarani
+/peso
+/lira
+/recipe
+/interrobang
+/interrobangdown
+/dong
+/trademark
+% 152
+/pertenthousand
+/pilcrow
+/baht
+/numero
+/discount
+/estimated
+/openbullet
+/servicemark
+% 160
+/quillbracketleft
+/quillbracketright
+/cent
+/sterling
+/currency
+/yen
+/brokenbar
+/section
+% 168
+/asciidieresis
+/copyright
+/ordfeminine
+/copyleft
+/logicalnot
+/circledP
+/registered
+/asciimacron
+% 176
+/degree
+/plusminus
+/twosuperior
+/threesuperior
+/asciiacute
+/mu
+/paragraph
+/periodcentered
+% 184
+/referencemark
+/onesuperior
+/ordmasculine
+/radical
+/onequarter
+/onehalf
+/threequarters
+/euro
+% 192
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 200
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 208
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/multiply
+/.notdef
+% 216
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 224
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 232
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+% 240
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/divide
+/.notdef
+% 248
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+] def
+%%EndResource
+
+% End of file cantarell-ts1.enc.
diff --git a/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map b/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map
new file mode 100644
index 00000000000..7e18899459b
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/cantarell/cantarell.map
@@ -0,0 +1,20 @@
+raw-fixlatin-Cantarell-Regular Cantarell-Regular <cantarell-fixlatin.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont "
+raw-ot1-Cantarell-Regular Cantarell-Regular <cantarell-ot1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont "
+raw-fixlatin-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-fixlatin.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont 0.167 SlantFont "
+raw-ot1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-ot1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
+raw-fixlatin-Cantarell-Bold Cantarell-Bold <cantarell-fixlatin.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont "
+raw-ot1-Cantarell-Bold Cantarell-Bold <cantarell-ot1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont "
+raw-fixlatin-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-fixlatin.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixlatin ReEncodeFont 0.167 SlantFont "
+raw-ot1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-ot1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
+raw-t1-Cantarell-Regular Cantarell-Regular <cantarell-t1.enc <Cantarell-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont "
+raw-t1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-t1.enc <Cantarell-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
+raw-t1-Cantarell-Bold Cantarell-Bold <cantarell-t1.enc <Cantarell-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont "
+raw-t1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-t1.enc <Cantarell-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
+raw-fixtextcomp-Cantarell-Regular Cantarell-Regular <cantarell-fixtextcomp.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont "
+raw-ts1-Cantarell-Regular Cantarell-Regular <cantarell-ts1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont "
+raw-fixtextcomp-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-fixtextcomp.enc <Cantarell-Regular.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont 0.167 SlantFont "
+raw-ts1-Cantarell-Regular-Slanted Cantarell-Regular <cantarell-ts1.enc <Cantarell-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
+raw-fixtextcomp-Cantarell-Bold Cantarell-Bold <cantarell-fixtextcomp.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont "
+raw-ts1-Cantarell-Bold Cantarell-Bold <cantarell-ts1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont "
+raw-fixtextcomp-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-fixtextcomp.enc <Cantarell-Bold.pfb " fontinst-autoenc-cantarell-fixtextcomp ReEncodeFont 0.167 SlantFont "
+raw-ts1-Cantarell-Bold-Slanted Cantarell-Bold <cantarell-ts1.enc <Cantarell-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm
new file mode 100644
index 00000000000..a10d4f903ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..269d38fe690
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm
new file mode 100644
index 00000000000..2d4f1d69f36
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..ec0a40e9be3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm
new file mode 100644
index 00000000000..831004500cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..32cfa32f9e5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm
new file mode 100644
index 00000000000..11e0e5fa41e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..0626fda2824
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ot1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..6cf7c3455f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..5574ec92424
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..612abe407a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..ce775f61548
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixlatin-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..44f2fda4112
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..d0edbdc5257
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..5e2c44db443
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..4d5f1ad9d58
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-fixtextcomp-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..17f3693ebea
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..83a84672e1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..73afbdf4b9e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..1cc7417c9ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ot1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..9837364bc24
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..f0ada3edb7f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..ecb73eda4a3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..f33d723addf
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-t1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..770a4837795
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..67cdbc79643
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..e7a9f789ace
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..0427dbe6e51
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/raw-ts1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm
new file mode 100644
index 00000000000..6e9b7587b21
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..a6b8236c0b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm
new file mode 100644
index 00000000000..ef4da8fe7cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..7f8be42a635
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm
new file mode 100644
index 00000000000..185b5292f7b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..2f2eaf4b3b2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm
new file mode 100644
index 00000000000..798b8d68c6c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular-SmallCaps.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..96de665b57b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/t1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm
new file mode 100644
index 00000000000..60d56d5ae54
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm
new file mode 100644
index 00000000000..a7fd2fbd12c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Bold.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm
new file mode 100644
index 00000000000..bdba275f435
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular-Slanted.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm
new file mode 100644
index 00000000000..36dd31077f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/cantarell/ts1-Cantarell-Regular.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Bold.pfb
new file mode 100644
index 00000000000..f77774f8212
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..eb0b91817fd
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/cantarell/Cantarell-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf
new file mode 100644
index 00000000000..883afb78711
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf
new file mode 100644
index 00000000000..0a49cf441b8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf
new file mode 100644
index 00000000000..3fa466de015
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf
new file mode 100644
index 00000000000..9d1861b033a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Bold.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf
new file mode 100644
index 00000000000..dd06c325b18
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf
new file mode 100644
index 00000000000..8e9f2fda564
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf
new file mode 100644
index 00000000000..97be8fe5ef2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf
new file mode 100644
index 00000000000..6baf910ff99
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ot1-Cantarell-Regular.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf
new file mode 100644
index 00000000000..8f9566409b4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf
new file mode 100644
index 00000000000..14bcbabd76a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf
new file mode 100644
index 00000000000..479e1c7965a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf
new file mode 100644
index 00000000000..869027db39b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Bold.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf
new file mode 100644
index 00000000000..9989508eb23
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf
new file mode 100644
index 00000000000..e2151626eb6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf
new file mode 100644
index 00000000000..192aadba2ed
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular-SmallCaps.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf
new file mode 100644
index 00000000000..6cb4ed214a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/t1-Cantarell-Regular.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf
new file mode 100644
index 00000000000..acfda4389a2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf
new file mode 100644
index 00000000000..34033d7aa95
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Bold.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf
new file mode 100644
index 00000000000..bd81f7da9fc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular-Slanted.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf
new file mode 100644
index 00000000000..2f199e9c376
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/cantarell/ts1-Cantarell-Regular.vf
Binary files differ
diff --git a/Master/texmf-dist/source/cantarell/Makefile b/Master/texmf-dist/source/cantarell/Makefile
new file mode 100644
index 00000000000..ff2ffbcddf4
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/Makefile
@@ -0,0 +1,217 @@
+## Makefile
+## 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)
+# any later version. The latest version of this license is in
+# http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+# distributions of LaTeX version 2005/12/01 or later.
+#
+# This work has the LPPL maintenance status `maintained'.
+#
+# The Current Maintainer of this work is Mohamed El Morabity
+#
+# This work consists of all files listed in manifest.txt.
+
+######################
+# Fonts informations #
+######################
+
+FONT_NAME = cantarell
+FOUNDRY = public
+FONT_CODES = fca
+
+# Supported LaTeX encodings
+SUPPORTED_ENCODINGS = ot1 t1 ts1
+# Supported LaTeX encodings containing small caps
+SUPPORTED_SC_ENCODINGS = $(filter-out ts1,$(SUPPORTED_ENCODINGS))
+# Custom encodings provided
+CUSTOM_ENCODINGS = $(FONT_NAME)-fixlatin $(FONT_NAME)-fixtextcomp
+
+
+#####################
+# Installation root #
+#####################
+
+TEXMFHOME = $(shell kpsexpand '$$TEXMFHOME')
+
+
+###########
+# Archive #
+###########
+
+ARCHIVE_ROOT = $(FONT_NAME)
+ARCHIVE = $(FONT_NAME).zip
+
+
+###########
+# Sources #
+###########
+
+FONTFORGE_FILES = $(wildcard *.sfd)
+
+# Fontinst files
+FONTINST_FILE = $(FONT_NAME)-drv.tex
+FONTINST_REGLYPH_FILE = $(FONT_NAME)-reglyph.tex
+FONTINST_MAP_FILE = $(FONT_NAME)-map.tex
+
+# Custom Fontinst encoding files
+ETX_FILES = $(CUSTOM_ENCODINGS:=.etx)
+
+STYLE_FILES = $(wildcard *.sty)
+
+DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)-samples.tex $(FONT_NAME)-samples.pdf README
+
+# Files to be installed in texmf/source
+BUILD_FILES = $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE) $(FONTINST_MAP_FILE) $(ETX_FILES) Makefile sfd2type1.pe $(DOCUMENTATION)
+
+# Source files to be installed
+SOURCES_FILES = $(FONTFORGE_FILES) $(STYLE_FILES) $(BUILD_FILES) $(DOCUMENTATION)
+
+
+
+###################
+# Generated files #
+###################
+
+TYPE1_FILES = $(FONTFORGE_FILES:.sfd=.pfb)
+AFM_FILES = $(TYPE1_FILES:.pfb=.afm)
+
+# Fontinst log file
+FONTINST_REC_FILE = $(FONT_NAME)-rec.tex
+
+# Metrics files
+PL_FILES = $(foreach e,$(SUPPORTED_ENCODINGS) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=%), \
+ $(foreach f,$(FONTFORGE_FILES:.sfd=), \
+ raw-$(e)-$(f).pl raw-$(e)-$(f)-Slanted.pl \
+ ) \
+ )
+TMP_MTX_FILES = $(PL_FILES:%.pl=%.mtx) $(PL_FILES:raw-%.pl=%.mtx)
+VPL_FILES = $(foreach f,$(FONTFORGE_FILES:.sfd=), \
+ $(foreach e,$(SUPPORTED_ENCODINGS), \
+ $(e)-$(f).vpl $(e)-$(f)-Slanted.vpl \
+ ) \
+ $(foreach e,$(SUPPORTED_SC_ENCODINGS), \
+ $(e)-$(f)-SmallCaps.vpl $(e)-$(f)-Slanted-SmallCaps.vpl \
+ ) \
+ )
+TFM_FILES = $(PL_FILES:.pl=.tfm) $(VPL_FILES:.vpl=.tfm)
+VF_FILES = $(VPL_FILES:.vpl=.vf)
+
+MAP = $(FONT_NAME).map
+
+# Font definition files
+FD_FILES = $(foreach e,$(SUPPORTED_ENCODINGS), \
+ $(foreach f,$(FONT_CODES), \
+ $(e)$(f).fd \
+ ) \
+ )
+
+# Generated encoding files
+ENC_FILES = $(SUPPORTED_ENCODINGS:%=$(FONT_NAME)-%.enc) $(CUSTOM_ENCODINGS:$(FONT_NAME)-%=$(FONT_NAME)-%.enc)
+
+# Generated files to be installed
+GENERATED_FILES = $(TYPE1_FILES) $(AFM_FILES) $(TFM_FILES) $(VF_FILES) $(MAP) $(FD_FILES) $(ENC_FILES)
+
+
+
+
+default: all
+
+
+all: dist
+
+
+dist: $(ARCHIVE)
+
+
+%.pfb %.afm: %.sfd
+ fontforge sfd2type1.pe $<
+
+
+%.tfm: %.pl
+ pltotf $< $@
+
+
+%.tfm: %.vpl
+ vptovf $^ $
+
+
+%.vf: %.vpl
+ vptovf $^ $@
+
+
+$(FONTINST_REC_FILE): $(TYPE1_FILES) $(AFM_FILES) $(ETX_FILES) $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE)
+ latex $(FONTINST_FILE)
+
+
+$(PL_FILES) $(VPL_FILES): $(FONTINST_REC_FILE)
+
+
+$(MAP): $(FONTINST_REC_FILE) $(FONTINST_MAP_FILE)
+ latex $(FONTINST_MAP_FILE)
+
+
+$(FD_FILES) $(ENC_FILES): $(MAP)
+
+
+texmf-tree: clean-texmf-tree $(GENERATED_FILES) $(SOURCES_FILES)
+ mkdir -p $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+ mkdir -p $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
+ mkdir -p $(ARCHIVE_ROOT)/fonts/{enc,map}/dvips/$(FONT_NAME)/
+ mkdir -p $(ARCHIVE_ROOT)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
+ mkdir -p $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
+ cp -p $(DOCUMENTATION) $(ARCHIVE_ROOT)/doc/latex/$(FONT_NAME)/
+ cp -p $(FD_FILES) $(STYLE_FILES) $(ARCHIVE_ROOT)/tex/latex/$(FONT_NAME)/
+ cp -p $(ENC_FILES) $(ARCHIVE_ROOT)/fonts/enc/dvips/$(FONT_NAME)/
+ cp -p $(MAP) $(ARCHIVE_ROOT)/fonts/map/dvips/$(FONT_NAME)/
+ cp -p $(AFM_FILES) $(ARCHIVE_ROOT)/fonts/afm/$(FOUNDRY)/$(FONT_NAME)/
+ cp -p $(TFM_FILES) $(ARCHIVE_ROOT)/fonts/tfm/$(FOUNDRY)/$(FONT_NAME)/
+ cp -p $(TYPE1_FILES) $(ARCHIVE_ROOT)/fonts/type1/$(FOUNDRY)/$(FONT_NAME)/
+ cp -p $(VF_FILES) $(ARCHIVE_ROOT)/fonts/vf/$(FOUNDRY)/$(FONT_NAME)/
+ cp -p $(BUILD_FILES) $(ARCHIVE_ROOT)/source/$(FONT_NAME)/
+ cp -p README $(ARCHIVE_ROOT)
+ cd $(ARCHIVE_ROOT) && find . -type f > manifest.txt
+
+
+$(ARCHIVE): clean-texmf-tree texmf-tree
+ zip -r $@ $(ARCHIVE_ROOT)
+
+
+install: texmf-tree
+ mkdir -p $(TEXMFHOME)
+ cp -a $(ARCHIVE_ROOT)/* $(TEXMFHOME)
+ texhash
+ updmap --enable Map=$(MAP)
+
+
+uninstall:
+ $(RM) -r $(TEXMFHOME)/doc/latex/$(FONT_NAME)/
+ $(RM) -r $(TEXMFHOME)/tex/latex/$(FONT_NAME)/
+ $(RM) -r $(TEXMFHOME)/fonts/{enc,map}/dvips/$(FONT_NAME)/
+ $(RM) -r $(TEXMFHOME)/fonts/{afm,tfm,truetype,type1,vf}/$(FOUNDRY)/$(FONT_NAME)/
+ $(RM) -r $(TEXMFHOME)/source/$(FONT_NAME)/
+ updmap --disable $(MAP)
+ texhash
+
+
+clean: clean-texmf-tree
+ $(RM) $(TYPE1_FILES) $(AFM_FILES)
+ $(RM) $(FONTINST_REC_FILE)
+ $(RM) $(PL_FILES) $(TYPE1_FILES:.pfb=.pl)
+ $(RM) $(TMP_MTX_FILES) $(TYPE1_FILES:.pfb=.mtx)
+ $(RM) $(VPL_FILES)
+ $(RM) $(TFM_FILES)
+ $(RM) $(VF_FILES)
+ $(RM) $(MAP)
+ $(RM) $(FD_FILES)
+ $(RM) $(ENC_FILES)
+ $(RM) $(ARCHIVE)
+ $(RM) *~ *.log
+
+
+clean-texmf-tree:
+ $(RM) -r $(ARCHIVE_ROOT)
+
+
+.PHONY: clean clean-texmf-tree texmf-tree
diff --git a/Master/texmf-dist/source/cantarell/README b/Master/texmf-dist/source/cantarell/README
new file mode 100644
index 00000000000..19b323d4d0b
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/README
@@ -0,0 +1,22 @@
+------------------------
+ Cantarell, version 1.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
+http://download.gnome.org/sources/cantarell-fonts/0.0/.
+
+This package provides support for this font in LaTeX. It includes Type 1
+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.
+
+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
+Open Font License version 1.1.
+
+If you have comments about the package, please contact Mohamed El Morabity
+(melmorabity AT fedoraproject DOT org).
diff --git a/Master/texmf-dist/source/cantarell/cantarell-drv.tex b/Master/texmf-dist/source/cantarell/cantarell-drv.tex
new file mode 100644
index 00000000000..48477321388
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-drv.tex
@@ -0,0 +1,137 @@
+%% cantarell-drv.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\input fontinst.sty
+
+
+\setint{slant}{167}
+\setint{smallcapsscale}{800}
+
+\substitutesilent{scit}{scsl}
+
+
+\recordtransforms{cantarell-rec.tex}
+
+
+\foreach(encoding){ot1,t1,ts1}
+ \transformfont{raw-\str{encoding}-Cantarell-Regular}{\reencodefont{\str{encoding}}{\fromafm{Cantarell-Regular}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Cantarell-Regular}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Bold}{\reencodefont{\str{encoding}}{\fromafm{Cantarell-Bold}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Cantarell-Bold}}}
+\endfor(encoding)
+
+\foreach(encoding){fixlatin,fixtextcomp}
+ \transformfont{raw-\str{encoding}-Cantarell-Regular}{\reencodefont{cantarell-\str{encoding}}{\fromafm{Cantarell-Regular}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{cantarell-\str{encoding}}{\fromafm{Cantarell-Regular}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Bold}{\reencodefont{cantarell-\str{encoding}}{\fromafm{Cantarell-Bold}}}
+ \transformfont{raw-\str{encoding}-Cantarell-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{cantarell-\str{encoding}}{\fromafm{Cantarell-Bold}}}
+\endfor(encoding)
+
+\input cantarell-reglyph
+
+
+\fontinstcc
+\def\fd_family#1#2#3{
+ \a_toks{#3}
+ \edef\lowercase_file{\lowercase{
+ \edef\noexpand\lowercase_file{#1#2.fd}}}
+ \lowercase_file
+ \open_out{\lowercase_file}
+ \out_line{\percent_char~Filename:~\lowercase_file}
+ \out_line{\percent_char~Created~by:~tex~\jobname}
+ \out_line{\percent_char~Created~using~fontinst~v\fontinstversion}
+ \out_line{}
+ \out_line{\percent_char~THIS~FILE~SHOULD~BE~PUT~IN~A~TEX~INPUTS~
+ DIRECTORY}
+ \out_line{}
+ \out_line{\string\ProvidesFile{\lowercase_file}}
+ \out_lline{[
+ \the\year/
+ \ifnum10>\month0\fi\the\month/
+ \ifnum10>\day0\fi\the\day\space
+ Fontinst~v\fontinstversion\space
+ font~definitions~for~#1/#2.
+ ]}
+ \out_line{}
+ %%%
+ \out_line{\string\expandafter\string\ifx\string\csname\space cantarell@scale\string\endcsname\string\relax}
+ \out_line{\space\space\string\let\string\cantarell@scale\string\@empty}
+ \out_line{\string\fi}
+ \out_line{}
+ %%%
+ \out_line{\string\DeclareFontFamily{#1}{#2}{\the\a_toks}}
+ {
+ \csname #1-#2\endcsname
+ \out_line{}
+ \let\do_shape=\substitute_shape
+ \csname #1-#2\endcsname
+ \let\do_shape=\remove_shape
+ \csname #1-#2\endcsname
+ }
+ \x_cs\g_let{#1-#2}\x_relax
+ \out_line{}
+ \out_line{\string\endinput}
+ \close_out{Font~definitions}
+}
+\normalcc
+
+
+\installfonts
+\installfamily{OT1}{fca}{}
+
+\installfont{ot1-Cantarell-Regular}{ot1-Cantarell-Regular,fixlatin-Cantarell-Regular,newlatin}{ot1}{OT1}{fca}{m}{n}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Regular-Slanted}{ot1-Cantarell-Regular-Slanted,fixlatin-Cantarell-Regular-Slanted,newlatin}{ot1}{OT1}{fca}{m}{sl}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Regular-SmallCaps}{ot1-Cantarell-Regular,fixlatin-Cantarell-Regular,newlatin}{ot1c}{OT1}{fca}{m}{sc}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Regular-Slanted-SmallCaps}{ot1-Cantarell-Regular-Slanted,fixlatin-Cantarell-Regular-Slanted,newlatin}{ot1c}{OT1}{fca}{m}{scsl}{<->\string\cantarell@scale}
+
+\installfont{ot1-Cantarell-Bold}{ot1-Cantarell-Bold,fixlatin-Cantarell-Bold,newlatin}{ot1}{OT1}{fca}{b}{n}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Bold-Slanted}{ot1-Cantarell-Bold-Slanted,fixlatin-Cantarell-Bold-Slanted,newlatin}{ot1}{OT1}{fca}{b}{sl}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Bold-SmallCaps}{ot1-Cantarell-Bold,fixlatin-Cantarell-Bold,newlatin}{ot1c}{OT1}{fca}{b}{sc}{<->\string\cantarell@scale}
+\installfont{ot1-Cantarell-Bold-Slanted-SmallCaps}{ot1-Cantarell-Bold-Slanted,fixlatin-Cantarell-Bold-Slanted,newlatin}{ot1c}{OT1}{fca}{b}{scsl}{<->\string\cantarell@scale}
+\endinstallfonts
+
+
+\installfonts
+\installfamily{T1}{fca}{}
+
+\installfont{t1-Cantarell-Regular}{t1-Cantarell-Regular,fixlatin-Cantarell-Regular,newlatin}{t1}{T1}{fca}{m}{n}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Regular-Slanted}{t1-Cantarell-Regular-Slanted,fixlatin-Cantarell-Regular-Slanted,newlatin}{t1}{T1}{fca}{m}{sl}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Regular-SmallCaps}{t1-Cantarell-Regular,fixlatin-Cantarell-Regular,newlatin}{t1c}{T1}{fca}{m}{sc}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Regular-Slanted-SmallCaps}{t1-Cantarell-Regular-Slanted,fixlatin-Cantarell-Regular-Slanted,newlatin}{t1c}{T1}{fca}{m}{scsl}{<->\string\cantarell@scale}
+
+\installfont{t1-Cantarell-Bold}{t1-Cantarell-Bold,fixlatin-Cantarell-Bold,newlatin}{t1}{T1}{fca}{b}{n}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Bold-Slanted}{t1-Cantarell-Bold-Slanted,fixlatin-Cantarell-Bold-Slanted,newlatin}{t1}{T1}{fca}{b}{sl}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Bold-SmallCaps}{t1-Cantarell-Bold,fixlatin-Cantarell-Bold,newlatin}{t1c}{T1}{fca}{b}{sc}{<->\string\cantarell@scale}
+\installfont{t1-Cantarell-Bold-Slanted-SmallCaps}{t1-Cantarell-Bold-Slanted,fixlatin-Cantarell-Bold-Slanted,newlatin}{t1c}{T1}{fca}{b}{scsl}{<->\string\cantarell@scale}
+\endinstallfonts
+
+
+\installfonts
+\installfamily{TS1}{fca}{}
+
+\installfont{ts1-Cantarell-Regular}{ts1-Cantarell-Regular,fixtextcomp-Cantarell-Regular,textcomp}{ts1}{TS1}{fca}{m}{n}{<->\string\cantarell@scale}
+\installfont{ts1-Cantarell-Regular-Slanted}{ts1-Cantarell-Regular-Slanted,fixtextcomp-Cantarell-Regular-Slanted,textcomp}{ts1}{TS1}{fca}{m}{sl}{<->\string\cantarell@scale}
+\installfontas{ts1-Cantarell-Regular}{TS1}{fca}{m}{sc}{<->\string\cantarell@scale}
+\installfontas{ts1-Cantarell-Regular-Slanted}{TS1}{fca}{m}{scsl}{<->\string\cantarell@scale}
+
+\installfont{ts1-Cantarell-Bold}{ts1-Cantarell-Bold,fixtextcomp-Cantarell-Bold,textcomp}{ts1}{TS1}{fca}{b}{n}{<->\string\cantarell@scale}
+\installfont{ts1-Cantarell-Bold-Slanted}{ts1-Cantarell-Bold-Slanted,fixtextcomp-Cantarell-Bold-Slanted,textcomp}{ts1}{TS1}{fca}{b}{sl}{<->\string\cantarell@scale}
+\installfontas{ts1-Cantarell-Bold}{TS1}{fca}{b}{sc}{<->\string\cantarell@scale}
+\installfontas{ts1-Cantarell-Bold-Slanted}{TS1}{fca}{b}{scsl}{<->\string\cantarell@scale}
+\endinstallfonts
+
+
+\endrecordtransforms
+\bye
diff --git a/Master/texmf-dist/source/cantarell/cantarell-fixlatin.etx b/Master/texmf-dist/source/cantarell/cantarell-fixlatin.etx
new file mode 100644
index 00000000000..2f0ad8d6a36
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-fixlatin.etx
@@ -0,0 +1,75 @@
+%% cantarell-fixlatin.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+\encoding
+
+% dbar
+\setslot{dcroat}
+\endsetslot
+
+% Ng
+\setslot{Eng}
+\endsetslot
+
+% ng
+\setslot{eng}
+\endsetslot
+
+% Tcedilla
+\setslot{Tcommaaccent}
+\endsetslot
+
+% tcedilla
+\setslot{tcommaaccent}
+\endsetslot
+
+% dotlessj
+\setslot{uni0237}
+\endsetslot
+
+% ringfitted
+\setslot{ring}
+\endsetslot
+
+% rangedash
+\setslot{endash}
+\endsetslot
+
+% punctdash
+\setslot{emdash}
+\endsetslot
+
+% ff
+\setslot{uniFB00}
+\endsetslot
+
+% fi
+\setslot{uniFB01}
+\endsetslot
+
+% fl
+\setslot{uniFB02}
+\endsetslot
+
+% ffi
+\setslot{uniFB03}
+\endsetslot
+
+% ffl
+\setslot{uniFB04}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/cantarell/cantarell-fixtextcomp.etx b/Master/texmf-dist/source/cantarell/cantarell-fixtextcomp.etx
new file mode 100644
index 00000000000..6eec480475d
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-fixtextcomp.etx
@@ -0,0 +1,137 @@
+%% cantarell-fixtextcomp.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+\encoding
+
+% Needed to set vaxis variable
+\setslot{parenleft}
+\endsetslot
+
+% Needed to fake asteriskcentered
+\setslot{asterisk}
+\endsetslot
+
+% Needed to fake centigrade
+\setslot{C}
+\endsetslot
+
+% Needed to set descender variable
+\setslot{g}
+\endsetslot
+
+% Needed to fake openbracketleft
+\setslot{bracketleft}
+\endsetslot
+
+% Needed to fake openbracketright
+\setslot{bracketright}
+\endsetslot
+
+% capitalgreve, asciigrave
+% Needed to fake asciigravedbl
+\setslot{grave}
+\endsetslot
+
+% Needed to fake bardbl
+\setslot{bar}
+\endsetslot
+
+% tildelow
+\setslot{asciitilde}
+\endsetslot
+
+% capitaldieresis, asciidieresis
+\setslot{dieresis}
+\endsetslot
+
+% capitalmacron, asciimacron
+\setslot{macron}
+\endsetslot
+
+% twosuperior
+\setslot{uni00B2}
+\endsetslot
+
+% threesuperior
+\setslot{uni00B3}
+\endsetslot
+
+% capitalacute, asciiacute
+% Needed to fake asciiacutedbl
+\setslot{acute}
+\endsetslot
+
+% mu
+\setslot{uni00B5}
+\endsetslot
+
+% cedilla
+\setslot{cedilla}
+\endsetslot
+
+% onesuperior
+\setslot{uni00B9}
+\endsetslot
+
+% capitalcircumflex
+\setslot{circumflex}
+\endsetslot
+
+% capitalcaron, asciicaron
+\setslot{caron}
+\endsetslot
+
+% capitalbreve, asciibreve
+\setslot{breve}
+\endsetslot
+
+% capitaldotaccent
+\setslot{dotaccent}
+\endsetslot
+
+% capitalring
+\setslot{ring}
+\endsetslot
+
+% ogonek
+\setslot{ogonek}
+\endsetslot
+
+% capitaltilde
+\setslot{tilde}
+\endsetslot
+
+% capitalhungarumlaut
+\setslot{hungarumlaut}
+\endsetslot
+
+% Needed to fake twelveudash and threequartersemdash
+\setslot{endash}
+\endsetslot
+
+% quotesinglebase
+\setslot{quotesinglebase}
+\endsetslot
+
+% quotedblbase
+\setslot{quotedblbase}
+\endsetslot
+
+% euro
+\setslot{Euro}
+\endsetslot
+
+\endencoding
diff --git a/Master/texmf-dist/source/cantarell/cantarell-map.tex b/Master/texmf-dist/source/cantarell/cantarell-map.tex
new file mode 100644
index 00000000000..a674bbf62c7
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-map.tex
@@ -0,0 +1,28 @@
+%% cantarell-map.etx
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\input finstmsc.sty
+
+\resetstr{PSfontsuffix}{.pfb}
+
+\foreach(encoding){ot1,t1,ts1}
+ \etxtoenc{\str{encoding}}{cantarell-\str{encoding}}
+\endfor(encoding)
+
+\adddriver{dvips}{cantarell.map}
+\input cantarell-rec.tex
+\donedrivers
+
+\bye
diff --git a/Master/texmf-dist/source/cantarell/cantarell-reglyph.tex b/Master/texmf-dist/source/cantarell/cantarell-reglyph.tex
new file mode 100644
index 00000000000..29a07c3d5fa
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-reglyph.tex
@@ -0,0 +1,71 @@
+%% cantarell-reglyph.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\relax
+
+
+\reglyphfonts
+ \reglyphfont{ot1-Cantarell-Regular}{raw-ot1-Cantarell-Regular}
+ \reglyphfont{ot1-Cantarell-Regular-Slanted}{raw-ot1-Cantarell-Regular-Slanted}
+ \reglyphfont{ot1-Cantarell-Bold}{raw-ot1-Cantarell-Bold}
+ \reglyphfont{ot1-Cantarell-Bold-Slanted}{raw-ot1-Cantarell-Bold-Slanted}
+\endreglyphfonts
+
+
+\reglyphfonts
+ \reglyphfont{t1-Cantarell-Regular}{raw-t1-Cantarell-Regular}
+ \reglyphfont{t1-Cantarell-Regular-Slanted}{raw-t1-Cantarell-Regular-Slanted}
+ \reglyphfont{t1-Cantarell-Bold}{raw-t1-Cantarell-Bold}
+ \reglyphfont{t1-Cantarell-Bold-Slanted}{raw-t1-Cantarell-Bold-Slanted}
+\endreglyphfonts
+
+\reglyphfonts
+ \renameglyph{Ng}{Eng}
+ \renameglyph{dbar}{dcroat}
+ \renameglyph{ng}{eng}
+ \renameglyph{Tcedilla}{Tcommaaccent}
+ \renameglyph{tcedilla}{tcommaaccent}
+ \renameglyph{dotlessj}{uni0237}
+ \renameglyph{ff}{uniFB00}
+ \renameglyph{fi}{uniFB01}
+ \renameglyph{fl}{uniFB02}
+ \renameglyph{ffi}{uniFB03}
+ \renameglyph{ffl}{uniFB04}
+
+ \reglyphfont{fixlatin-Cantarell-Regular}{raw-fixlatin-Cantarell-Regular}
+ \reglyphfont{fixlatin-Cantarell-Regular-Slanted}{raw-fixlatin-Cantarell-Regular-Slanted}
+ \reglyphfont{fixlatin-Cantarell-Bold}{raw-fixlatin-Cantarell-Bold}
+ \reglyphfont{fixlatin-Cantarell-Bold-Slanted}{raw-fixlatin-Cantarell-Bold-Slanted}
+\endreglyphfonts
+
+
+\reglyphfonts
+ \reglyphfont{ts1-Cantarell-Regular}{raw-ts1-Cantarell-Regular}
+ \reglyphfont{ts1-Cantarell-Regular-Slanted}{raw-ts1-Cantarell-Regular-Slanted}
+ \reglyphfont{ts1-Cantarell-Bold}{raw-ts1-Cantarell-Bold}
+ \reglyphfont{ts1-Cantarell-Bold-Slanted}{raw-ts1-Cantarell-Bold-Slanted}
+\endreglyphfonts
+
+\reglyphfonts
+ \renameglyph{twosuperior}{uni00B2}
+ \renameglyph{threesuperior}{uni00B3}
+ \renameglyph{onesuperior}{uni00B9}
+ \renameglyph{mu}{uni00B5}
+
+ \reglyphfont{fixtextcomp-Cantarell-Regular}{raw-fixtextcomp-Cantarell-Regular}
+ \reglyphfont{fixtextcomp-Cantarell-Regular-Slanted}{raw-fixtextcomp-Cantarell-Regular-Slanted}
+ \reglyphfont{fixtextcomp-Cantarell-Bold}{raw-fixtextcomp-Cantarell-Bold}
+ \reglyphfont{fixtextcomp-Cantarell-Bold-Slanted}{raw-fixtextcomp-Cantarell-Bold-Slanted}
+\endreglyphfonts
diff --git a/Master/texmf-dist/source/cantarell/cantarell-samples.pdf b/Master/texmf-dist/source/cantarell/cantarell-samples.pdf
new file mode 100644
index 00000000000..8b4df023385
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/cantarell/cantarell-samples.tex b/Master/texmf-dist/source/cantarell/cantarell-samples.tex
new file mode 100644
index 00000000000..6e53d4cfd6f
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell-samples.tex
@@ -0,0 +1,63 @@
+%% cantarell-samples.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[francais,american]{babel}
+\usepackage{cantarell}
+\usepackage[T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\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é.%
+ }%
+}
+
+\newcommand{\miscSample}{%
+ 0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+ {\usefont{T1}{fca}{#1}{#2} \latinSample}
+
+ {\fontfamily{fca}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Cantarell Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\section*{Cantarell Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/source/cantarell/cantarell.pdf b/Master/texmf-dist/source/cantarell/cantarell.pdf
new file mode 100644
index 00000000000..5cb0e33e225
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/cantarell/cantarell.tex b/Master/texmf-dist/source/cantarell/cantarell.tex
new file mode 100644
index 00000000000..535448d15c3
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/cantarell.tex
@@ -0,0 +1,173 @@
+%% cantarell.tex
+%% Copyright 2010 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[american]{babel}
+\usepackage{booktabs}
+\usepackage[default]{cantarell}
+\usepackage{microtype}
+\usepackage{multirow}
+\usepackage{path}
+\usepackage{relsize}
+\usepackage[colorlinks]{hyperref}
+
+\hypersetup{%
+ pdftitle={LaTeX support for Cantarell},%
+ pdfauthor={Mohamed El Morabity}%
+}%
+
+\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
+\newcommand{\code}{\texttt}
+\newcommand{\command}{\texttt}
+\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
+\newcommand{\name}{}
+\newcommand{\package}{\texttt}
+\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
+\newcommand{\program}{}
+
+\title{\LaTeX{} support for Cantarell\\\relsize{-1}Version~1.0}
+
+\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\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}.
+
+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
+full support with \program{Dvips}.
+
+\section{Installation}
+
+These directions assume that your \TeX{} distribution is
+\acronym{TDS}-compliant.
+
+Once the \path|cantarell.zip| archive extracted:
+\begin{enumerate}
+\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
+ directories to your \path|texmf/| directory (either your local or global
+ \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},
+ \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
+\end{enumerate}
+
+Note that this package requires the \package{keyval}~\cite{keyval} and
+\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
+work.
+
+\section{Usage}
+
+\subsection{Calling Cantarell}
+
+You can use the Cantarell font in a \LaTeX{} document by adding the command
+\begin{verbatim}
+\usepackage{cantarell}
+\end{verbatim}
+to the preamble. The package supplies the \code{\char`\\fcafamily} command to
+switch the current font to Cantarell.
+
+\subsubsection{Options}
+
+\paragraph{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:
+\begin{verbatim}
+\usepackage[default]{cantarell}
+\end{verbatim}
+To set Cantarell as default sans-serif only:
+\begin{verbatim}
+\usepackage[defaultsans]{cantarell}
+\end{verbatim}
+
+\paragraph{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
+adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
+the font according to \parameter{ratio} (1.0 by default), for example:
+\begin{verbatim}
+\usepackage[scale=0.95]{cantarell}
+\end{verbatim}
+
+\subsection{Encodings}
+
+The following encodings are supported:
+\begin{center}
+ OT1, T1, TS1 (partial)
+\end{center}
+To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
+package as usual, as in
+\begin{verbatim}
+\usepackage[T1]{fontenc}
+\usepackage{cantarell}
+\end{verbatim}
+
+\subsection{Available weights and variants}
+
+The following table lists the available font series and shapes with their
+\acronym{NFSS} classification. Parenthesized combinations are provided via
+substitutions.
+\begin{center}
+ \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)\\
+ \bottomrule
+ \end{tabular}
+\end{center}
+Notice that the slanted shapes are faked ones, as well as the small capitals
+(reduced to 80\%).
+
+\section{Known bugs and improvements}
+
+Please send bug reports and suggestions about the Cantarell \LaTeX{} support to
+\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}, neither
+to Dave \name{Crossland} nor the \acronym{GNOME} project. They only distribute
+the font files themselves.
+
+\section{License}
+
+This package is released under the \LaTeX{} project public license, either
+version~1.3c or above~\cite{lppl}. Anyway both the Type~1 and Fontforge source
+files are delivered under the Open Font License version~1.1~\cite{ofl}.
+
+\begin{thebibliography}{9}
+\bibitem{cantarell} \url{http://download.gnome.org/sources/cantarell-fonts/0.0/}
+\bibitem{keyval}
+ \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
+\bibitem{slantsc}
+ \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
+\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
+\bibitem{ofl} \url{http://scripts.sil.org/OFL_web}
+\end{thebibliography}
+
+\end{document}
diff --git a/Master/texmf-dist/source/cantarell/sfd2type1.pe b/Master/texmf-dist/source/cantarell/sfd2type1.pe
new file mode 100644
index 00000000000..7a73db9d261
--- /dev/null
+++ b/Master/texmf-dist/source/cantarell/sfd2type1.pe
@@ -0,0 +1,22 @@
+#!/usr/bin/env fontforge
+## sfd2type1.pe
+## 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)
+# any later version. The latest version of this license is in
+# http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+# distributions of LaTeX version 2005/12/01 or later.
+#
+# This work has the LPPL maintenance status `maintained'.
+#
+# The Current Maintainer of this work is Mohamed El Morabity
+#
+# This work consists of all files listed in manifest.txt.
+
+i=1
+while (i < $argc)
+ Open($argv[i])
+ Generate($argv[i]:r + ".pfb")
+ i = i+1
+endloop
diff --git a/Master/texmf-dist/tex/latex/cantarell/cantarell.sty b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
new file mode 100644
index 00000000000..7662e1c16d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/cantarell.sty
@@ -0,0 +1,47 @@
+%% cantarell.sty
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{cantarell}[2011/04/02 Cantarell]
+
+\RequirePackage{keyval}
+\RequirePackage{slantsc}
+
+% Taken from inconsolata.sty
+\define@key{cantarell}{scale}[1.0]{\def\cantarell@scale{s*[#1]}}
+\DeclareOption*{%
+ \begingroup
+ \edef\x{\endgroup
+ \noexpand\setkeys{cantarell}{\CurrentOption}}%
+ \x%
+}
+
+\DeclareOption{defaultsans}{%
+ \renewcommand*{\sfdefault}{fca}%
+}
+
+\DeclareOption{default}{%
+ \renewcommand*{\familydefault}{fca}%
+ \renewcommand*{\sfdefault}{fca}%
+}
+
+\ProcessOptions*
+
+\newcommand{\fcafamily}{%
+ \fontfamily{fca}%
+ \selectfont%
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
new file mode 100644
index 00000000000..a6620d4b1bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/ot1fca.fd
@@ -0,0 +1,59 @@
+%Filename: ot1fca.fd
+%Created by: tex cantarell-drv
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ot1fca.fd}
+ [2011/04/06 Fontinst v1.927 font definitions for OT1/fca.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@scale\@empty
+\fi
+
+\DeclareFontFamily{OT1}{fca}{}
+
+\DeclareFontShape{OT1}{fca}{m}{n}{
+ <->\cantarell@scale ot1-Cantarell-Regular
+}{}
+
+\DeclareFontShape{OT1}{fca}{m}{sl}{
+ <->\cantarell@scale ot1-Cantarell-Regular-Slanted
+}{}
+
+\DeclareFontShape{OT1}{fca}{m}{sc}{
+ <->\cantarell@scale ot1-Cantarell-Regular-SmallCaps
+}{}
+
+\DeclareFontShape{OT1}{fca}{m}{scsl}{
+ <->\cantarell@scale ot1-Cantarell-Regular-Slanted-SmallCaps
+}{}
+
+\DeclareFontShape{OT1}{fca}{b}{n}{
+ <->\cantarell@scale ot1-Cantarell-Bold
+}{}
+
+\DeclareFontShape{OT1}{fca}{b}{sl}{
+ <->\cantarell@scale ot1-Cantarell-Bold-Slanted
+}{}
+
+\DeclareFontShape{OT1}{fca}{b}{sc}{
+ <->\cantarell@scale ot1-Cantarell-Bold-SmallCaps
+}{}
+
+\DeclareFontShape{OT1}{fca}{b}{scsl}{
+ <->\cantarell@scale ot1-Cantarell-Bold-Slanted-SmallCaps
+}{}
+
+\DeclareFontShape{OT1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
+\DeclareFontShape{OT1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
+\DeclareFontShape{OT1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
+\DeclareFontShape{OT1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{OT1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{OT1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
+\DeclareFontShape{OT1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
+\DeclareFontShape{OT1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{OT1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{OT1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/t1fca.fd b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
new file mode 100644
index 00000000000..bf39cb4a0e6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/t1fca.fd
@@ -0,0 +1,59 @@
+%Filename: t1fca.fd
+%Created by: tex cantarell-drv
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1fca.fd}
+ [2011/04/06 Fontinst v1.927 font definitions for T1/fca.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@scale\@empty
+\fi
+
+\DeclareFontFamily{T1}{fca}{}
+
+\DeclareFontShape{T1}{fca}{m}{n}{
+ <->\cantarell@scale t1-Cantarell-Regular
+}{}
+
+\DeclareFontShape{T1}{fca}{m}{sl}{
+ <->\cantarell@scale t1-Cantarell-Regular-Slanted
+}{}
+
+\DeclareFontShape{T1}{fca}{m}{sc}{
+ <->\cantarell@scale t1-Cantarell-Regular-SmallCaps
+}{}
+
+\DeclareFontShape{T1}{fca}{m}{scsl}{
+ <->\cantarell@scale t1-Cantarell-Regular-Slanted-SmallCaps
+}{}
+
+\DeclareFontShape{T1}{fca}{b}{n}{
+ <->\cantarell@scale t1-Cantarell-Bold
+}{}
+
+\DeclareFontShape{T1}{fca}{b}{sl}{
+ <->\cantarell@scale t1-Cantarell-Bold-Slanted
+}{}
+
+\DeclareFontShape{T1}{fca}{b}{sc}{
+ <->\cantarell@scale t1-Cantarell-Bold-SmallCaps
+}{}
+
+\DeclareFontShape{T1}{fca}{b}{scsl}{
+ <->\cantarell@scale t1-Cantarell-Bold-Slanted-SmallCaps
+}{}
+
+\DeclareFontShape{T1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
+\DeclareFontShape{T1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
+\DeclareFontShape{T1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
+\DeclareFontShape{T1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{T1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{T1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
+\DeclareFontShape{T1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
+\DeclareFontShape{T1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{T1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{T1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
new file mode 100644
index 00000000000..460511c6fea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cantarell/ts1fca.fd
@@ -0,0 +1,59 @@
+%Filename: ts1fca.fd
+%Created by: tex cantarell-drv
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{ts1fca.fd}
+ [2011/04/06 Fontinst v1.927 font definitions for TS1/fca.]
+
+\expandafter\ifx\csname cantarell@scale\endcsname\relax
+ \let\cantarell@scale\@empty
+\fi
+
+\DeclareFontFamily{TS1}{fca}{}
+
+\DeclareFontShape{TS1}{fca}{m}{n}{
+ <->\cantarell@scale ts1-Cantarell-Regular
+}{}
+
+\DeclareFontShape{TS1}{fca}{m}{sl}{
+ <->\cantarell@scale ts1-Cantarell-Regular-Slanted
+}{}
+
+\DeclareFontShape{TS1}{fca}{m}{sc}{
+ <->\cantarell@scale ts1-Cantarell-Regular
+}{}
+
+\DeclareFontShape{TS1}{fca}{m}{scsl}{
+ <->\cantarell@scale ts1-Cantarell-Regular-Slanted
+}{}
+
+\DeclareFontShape{TS1}{fca}{b}{n}{
+ <->\cantarell@scale ts1-Cantarell-Bold
+}{}
+
+\DeclareFontShape{TS1}{fca}{b}{sl}{
+ <->\cantarell@scale ts1-Cantarell-Bold-Slanted
+}{}
+
+\DeclareFontShape{TS1}{fca}{b}{sc}{
+ <->\cantarell@scale ts1-Cantarell-Bold
+}{}
+
+\DeclareFontShape{TS1}{fca}{b}{scsl}{
+ <->\cantarell@scale ts1-Cantarell-Bold-Slanted
+}{}
+
+\DeclareFontShape{TS1}{fca}{m}{it}{<->ssub * fca/m/sl}{}
+\DeclareFontShape{TS1}{fca}{m}{scit}{<->ssub * fca/m/scsl}{}
+\DeclareFontShape{TS1}{fca}{bx}{n}{<->ssub * fca/b/n}{}
+\DeclareFontShape{TS1}{fca}{bx}{sl}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{TS1}{fca}{b}{it}{<->ssub * fca/b/sl}{}
+\DeclareFontShape{TS1}{fca}{bx}{it}{<->ssub * fca/b/it}{}
+\DeclareFontShape{TS1}{fca}{bx}{sc}{<->ssub * fca/b/sc}{}
+\DeclareFontShape{TS1}{fca}{bx}{scsl}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{TS1}{fca}{b}{scit}{<->ssub * fca/b/scsl}{}
+\DeclareFontShape{TS1}{fca}{bx}{scit}{<->ssub * fca/b/scit}{}
+
+\endinput