From 3a8d2268677f2d2f3320c4410d9c34f6e98241ac Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 Jul 2012 14:42:23 +0000 Subject: cantarell 0.0.9 (11jun12) git-svn-id: svn://tug.org/texlive/trunk@27066 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/cantarell/CHANGES | 3 + Master/texmf-dist/doc/fonts/cantarell/README | 2 +- .../doc/fonts/cantarell/cantarell-samples.pdf | Bin 99469 -> 139933 bytes .../doc/fonts/cantarell/cantarell-samples.tex | 16 ++++- .../texmf-dist/doc/fonts/cantarell/cantarell.pdf | Bin 68572 -> 82717 bytes .../texmf-dist/doc/fonts/cantarell/cantarell.tex | 18 +++-- Master/texmf-dist/doc/fonts/cantarell/manifest.txt | 76 +++++++++++++++++++++ 7 files changed, 105 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/doc/fonts') diff --git a/Master/texmf-dist/doc/fonts/cantarell/CHANGES b/Master/texmf-dist/doc/fonts/cantarell/CHANGES index fac80d1635c..be5fd1a7ad6 100644 --- a/Master/texmf-dist/doc/fonts/cantarell/CHANGES +++ b/Master/texmf-dist/doc/fonts/cantarell/CHANGES @@ -14,3 +14,6 @@ Changelog for version 2.2: Changelog for version 2.3: - update font files to version 0.0.8 + +Changelog for version 2.4: + - update font files to version 0.0.9; Cyrillic support is included diff --git a/Master/texmf-dist/doc/fonts/cantarell/README b/Master/texmf-dist/doc/fonts/cantarell/README index af69e39d11d..057a59461ef 100644 --- a/Master/texmf-dist/doc/fonts/cantarell/README +++ b/Master/texmf-dist/doc/fonts/cantarell/README @@ -1,5 +1,5 @@ ------------------------ - Cantarell, version 2.3 + Cantarell, version 2.4 ------------------------ Cantarell is a contemporary Humanist sans serif designed by Dave Crossland and diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf index 3ee157a703b..38cb72269bc 100644 Binary files a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf and b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.pdf differ diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex index 09df5112a7c..c245267eb95 100644 --- a/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex +++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell-samples.tex @@ -1,5 +1,5 @@ %% cantarell-samples.tex -%% Copyright 2011 Mohamed El Morabity +%% Copyright 2011, 2012 Mohamed El Morabity % % This work may be distributed and/or modified under the conditions of the LaTeX % Project Public License, either version 1.3 of this license or (at your option) @@ -15,9 +15,9 @@ \documentclass{article} -\usepackage[francais,american]{babel} +\usepackage[russian,francais,american]{babel} \usepackage{cantarell} -\usepackage[T1,OT1]{fontenc} +\usepackage[T2A,T1,OT1]{fontenc} \usepackage[utf8x]{inputenc} \usepackage{microtype} \usepackage{textcomp} @@ -30,6 +30,14 @@ }% } +\newcommand{\cyrillicSample}{% + \foreignlanguage{russian}{% + Все люди рождаются свободными и равными в своем достоинстве и правах. Они + наделены разумом и совестью и должны поступать в отношении друг друга в духе + братства.% + }% +} + \newcommand{\miscSample}{% 0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen% @@ -38,6 +46,8 @@ \newcommand{\fontSample}[2]{% {\usefont{T1}{fca}{#1}{#2} \latinSample} + {\usefont{T2A}{fca}{#1}{#2}\cyrillicSample} + {\fontfamily{fca}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\% } diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf index b488caa55c9..c229f9780ea 100644 Binary files a/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf and b/Master/texmf-dist/doc/fonts/cantarell/cantarell.pdf differ diff --git a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex index 4d359709283..58149a1317b 100644 --- a/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex +++ b/Master/texmf-dist/doc/fonts/cantarell/cantarell.tex @@ -1,5 +1,5 @@ %% cantarell.tex -%% Copyright 2011 Mohamed El Morabity +%% Copyright 2011, 2012 Mohamed El Morabity % % This work may be distributed and/or modified under the conditions of the LaTeX % Project Public License, either version 1.3 of this license or (at your option) @@ -38,7 +38,7 @@ \newcommand{\parameter}[1]{\textnormal{\textit{#1}}} \newcommand{\program}{} -\title{\LaTeX{} support for Cantarell\\Version~2.3} +\title{\LaTeX{} support for Cantarell\\Version~2.4} \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}} @@ -127,8 +127,12 @@ the font according to \parameter{ratio} (1.0 by default), for example: \subsection{Encodings} -The following encodings are supported: OT1, T1, TS1 (partial). - +The following encodings are supported: +\begin{description} +\item[Latin] OT1, T1, TS1 (partial) +\item[Cyrillic] T2A, T2B, T2C, X2 +% \item[Greek] LGR (monotonic only) +\end{description} To use one or another encoding, give the \LaTeX{} name to the \package{fontenc} package as usual, as in \begin{verbatim} @@ -146,8 +150,10 @@ substitutions. \begin{tabular}{llll} \toprule family&encoding&series&shape\\ - \midrule - \multirow{3}{*}{fca}&OT1, T1&\multirow{2}{*}{m, b (bx)}&n, sl (it), sc, scsl (scit)\\ + \midrule + \multirow{3}{*}{fca}&OT1,T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, sl (it), sc, scsl (scit)}\\ + &T2A, T2B, T2C, X2,&&\\ +% &LGR&&\\ \cmidrule{2-2} \cmidrule{4-4} &TS1&&n, sl (it)\\ diff --git a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt index b8d8a4c681e..fb5e1dee54a 100644 --- a/Master/texmf-dist/doc/fonts/cantarell/manifest.txt +++ b/Master/texmf-dist/doc/fonts/cantarell/manifest.txt @@ -3,71 +3,147 @@ ./fonts/map/dvips/cantarell/cantarell.map ./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-x2.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-x2.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-t2b.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2a.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2b.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-03.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-03.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-t2c.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-t2b.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2b.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2b.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2a.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2a.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-x2.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-03.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-x2.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-t2a.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2a.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-x2.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-t2a.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-03.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2c.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2b.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-x2.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2a.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2b.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-x2.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2c.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2a.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm ./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm +./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2b.tfm ./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm +./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-x2.tfm +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2b.vf ./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2b.vf ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2b.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2a.vf +./fonts/vf/public/cantarell/Cantarell-Regular-t2b.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2c.vf +./fonts/vf/public/cantarell/Cantarell-Bold-t2c.vf +./fonts/vf/public/cantarell/Cantarell-Regular-t2c.vf ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-x2.vf ./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-t2a.vf +./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2b.vf ./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-x2.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2a.vf ./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2b.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2a.vf ./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2a.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2c.vf +./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2c.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2c.vf ./fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2a.vf +./fonts/vf/public/cantarell/Cantarell-Regular-x2.vf ./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-t2a.vf ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-x2.vf +./fonts/vf/public/cantarell/Cantarell-Bold-t2b.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-x2.vf ./fonts/vf/public/cantarell/Cantarell-Regular-t1.vf ./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2c.vf ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-x2.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2c.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-x2.vf ./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf ./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf +./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2a.vf +./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-x2.vf ./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf +./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2b.vf ./fonts/afm/public/cantarell/Cantarell-Regular.afm ./fonts/afm/public/cantarell/Cantarell-Bold.afm ./fonts/enc/dvips/cantarell/cantarell-02.enc +./fonts/enc/dvips/cantarell/cantarell-03.enc ./fonts/enc/dvips/cantarell/cantarell-01.enc ./fonts/type1/public/cantarell/Cantarell-Bold.pfb ./fonts/type1/public/cantarell/Cantarell-Regular.pfb +./tex/latex/cantarell/t2cfca.fd +./tex/latex/cantarell/x2fca.fd ./tex/latex/cantarell/ts1fca.fd ./tex/latex/cantarell/cantarell.sty ./tex/latex/cantarell/t1fca.fd +./tex/latex/cantarell/t2afca.fd ./tex/latex/cantarell/ot1fca.fd +./tex/latex/cantarell/t2bfca.fd ./source/fonts/cantarell/Cantarell-Bold.sfd ./source/fonts/cantarell/cantarell-map.tex +./source/fonts/cantarell/cantarell-fixgreek.mtx ./source/fonts/cantarell/Cantarell-Regular.sfd ./source/fonts/cantarell/sfd2type1.pe +./source/fonts/cantarell/cantarell-fixcyrillic.mtx ./source/fonts/cantarell/cantarell-fixtextcomp.mtx ./source/fonts/cantarell/Makefile ./source/fonts/cantarell/cantarell-fixlatin.mtx ./source/fonts/cantarell/cantarell-02.etx ./source/fonts/cantarell/cantarell-drv.tex +./source/fonts/cantarell/cantarell-03.etx ./source/fonts/cantarell/cantarell-01.etx ./doc/fonts/cantarell/README ./doc/fonts/cantarell/cantarell-samples.tex -- cgit v1.2.3