From 5d5a3ce7983e13fe5456b264448248f94d236f6d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 May 2011 23:18:56 +0000 Subject: comfortaa (8may11) git-svn-id: svn://tug.org/texlive/trunk@22360 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/comfortaa/comfortaa.sty | 32 ++++++---------------- Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/t1fco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/t2afco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd | 10 +++---- Master/texmf-dist/tex/latex/comfortaa/x2fco.fd | 10 +++---- 9 files changed, 49 insertions(+), 63 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty index bfb54a17927..fa5659a22c9 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty +++ b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty @@ -1,5 +1,5 @@ %% comfortaa.sty -%% Copyright 2010 Mohamed El Morabity +%% Copyright 2010, 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) @@ -14,7 +14,7 @@ % This work consists of all files listed in manifest.txt. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{comfortaa}[2010/12/18 Comfortaa] +\ProvidesPackage{comfortaa}[2011/03/24 Comfortaa] \RequirePackage{keyval} \RequirePackage{slantsc} @@ -28,43 +28,29 @@ \x% } -\newcommand{\comfortaa@series@normal}{m} - -\DeclareOption{regular}{% - \renewcommand{\comfortaa@series@normal}{m}% -} - -\DeclareOption{light}{% - \renewcommand{\comfortaa@series@normal}{l}% -} - \DeclareOption{defaultsans}{% \renewcommand*{\sfdefault}{fco}% - \renewcommand*{\mddefault}{\comfortaa@series@normal}% } \DeclareOption{default}{% - \renewcommand*{\familydefault}{fco}% \renewcommand*{\sfdefault}{fco}% - \renewcommand*{\mddefault}{\comfortaa@series@normal}% + \renewcommand*{\familydefault}{fco}% } \ProcessOptions* -\relax +\newcommand{\fcofamily}{% + \fontfamily{fco}% + \selectfont% +} + +% Fix search of words containing fi/fl ligatures in PDFs \@ifundefined{pdfglyphtounicode}{}{% % fi \pdfglyphtounicode{uniF001}{FB01}% % fl \pdfglyphtounicode{uniF002}{FB02}% - % \pdfgentounicode=1% } -\newcommand{\fcofamily}{% - \fontfamily{fco}% - \fontseries{\comfortaa@series@normal}% - \selectfont% -} - \endinput diff --git a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd index b2ef05a5c9f..cb7ae9167f4 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{lgrfco.fd} - [2011/01/11 Fontinst v1.927 font definitions for LGR/fco.] + [2011/03/24 Fontinst v1.927 font definitions for LGR/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{LGR}{fco}{l}{n}{ - <->\comfortaa@scale lgr-Comfortaa-Thin + <->\comfortaa@scale lgr-Comfortaa-Light }{} \DeclareFontShape{LGR}{fco}{l}{sl}{ - <->\comfortaa@scale lgr-Comfortaa-Thin-Slanted + <->\comfortaa@scale lgr-Comfortaa-Light-Slanted }{} \DeclareFontShape{LGR}{fco}{l}{sc}{ - <->\comfortaa@scale lgr-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale lgr-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{LGR}{fco}{l}{scsl}{ - <->\comfortaa@scale lgr-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale lgr-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{LGR}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd index e311edd7f7b..b9af7d9bc24 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{ot1fco.fd} - [2011/01/11 Fontinst v1.927 font definitions for OT1/fco.] + [2011/03/24 Fontinst v1.927 font definitions for OT1/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{OT1}{fco}{l}{n}{ - <->\comfortaa@scale ot1-Comfortaa-Thin + <->\comfortaa@scale ot1-Comfortaa-Light }{} \DeclareFontShape{OT1}{fco}{l}{sl}{ - <->\comfortaa@scale ot1-Comfortaa-Thin-Slanted + <->\comfortaa@scale ot1-Comfortaa-Light-Slanted }{} \DeclareFontShape{OT1}{fco}{l}{sc}{ - <->\comfortaa@scale ot1-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale ot1-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{OT1}{fco}{l}{scsl}{ - <->\comfortaa@scale ot1-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale ot1-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{OT1}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd index 11121ec8c16..043400edd06 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t1fco.fd} - [2011/01/11 Fontinst v1.927 font definitions for T1/fco.] + [2011/03/24 Fontinst v1.927 font definitions for T1/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{T1}{fco}{l}{n}{ - <->\comfortaa@scale t1-Comfortaa-Thin + <->\comfortaa@scale t1-Comfortaa-Light }{} \DeclareFontShape{T1}{fco}{l}{sl}{ - <->\comfortaa@scale t1-Comfortaa-Thin-Slanted + <->\comfortaa@scale t1-Comfortaa-Light-Slanted }{} \DeclareFontShape{T1}{fco}{l}{sc}{ - <->\comfortaa@scale t1-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale t1-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{T1}{fco}{l}{scsl}{ - <->\comfortaa@scale t1-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale t1-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{T1}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd index 64b6b1c8931..b74b0a0c30b 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t2afco.fd} - [2011/01/11 Fontinst v1.927 font definitions for T2A/fco.] + [2011/03/24 Fontinst v1.927 font definitions for T2A/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{T2A}{fco}{l}{n}{ - <->\comfortaa@scale t2a-Comfortaa-Thin + <->\comfortaa@scale t2a-Comfortaa-Light }{} \DeclareFontShape{T2A}{fco}{l}{sl}{ - <->\comfortaa@scale t2a-Comfortaa-Thin-Slanted + <->\comfortaa@scale t2a-Comfortaa-Light-Slanted }{} \DeclareFontShape{T2A}{fco}{l}{sc}{ - <->\comfortaa@scale t2a-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale t2a-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{T2A}{fco}{l}{scsl}{ - <->\comfortaa@scale t2a-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale t2a-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{T2A}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd index 4459b7a0616..e1dbffa6056 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t2bfco.fd} - [2011/01/11 Fontinst v1.927 font definitions for T2B/fco.] + [2011/03/24 Fontinst v1.927 font definitions for T2B/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{T2B}{fco}{l}{n}{ - <->\comfortaa@scale t2b-Comfortaa-Thin + <->\comfortaa@scale t2b-Comfortaa-Light }{} \DeclareFontShape{T2B}{fco}{l}{sl}{ - <->\comfortaa@scale t2b-Comfortaa-Thin-Slanted + <->\comfortaa@scale t2b-Comfortaa-Light-Slanted }{} \DeclareFontShape{T2B}{fco}{l}{sc}{ - <->\comfortaa@scale t2b-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale t2b-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{T2B}{fco}{l}{scsl}{ - <->\comfortaa@scale t2b-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale t2b-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{T2B}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd index b6c0474fadf..909efa9bfeb 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{t2cfco.fd} - [2011/01/11 Fontinst v1.927 font definitions for T2C/fco.] + [2011/03/24 Fontinst v1.927 font definitions for T2C/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{T2C}{fco}{l}{n}{ - <->\comfortaa@scale t2c-Comfortaa-Thin + <->\comfortaa@scale t2c-Comfortaa-Light }{} \DeclareFontShape{T2C}{fco}{l}{sl}{ - <->\comfortaa@scale t2c-Comfortaa-Thin-Slanted + <->\comfortaa@scale t2c-Comfortaa-Light-Slanted }{} \DeclareFontShape{T2C}{fco}{l}{sc}{ - <->\comfortaa@scale t2c-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale t2c-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{T2C}{fco}{l}{scsl}{ - <->\comfortaa@scale t2c-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale t2c-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{T2C}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd index 781563468ea..74a903a6eb1 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{ts1fco.fd} - [2011/01/11 Fontinst v1.927 font definitions for TS1/fco.] + [2011/03/24 Fontinst v1.927 font definitions for TS1/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{TS1}{fco}{l}{n}{ - <->\comfortaa@scale ts1-Comfortaa-Thin + <->\comfortaa@scale ts1-Comfortaa-Light }{} \DeclareFontShape{TS1}{fco}{l}{sl}{ - <->\comfortaa@scale ts1-Comfortaa-Thin-Slanted + <->\comfortaa@scale ts1-Comfortaa-Light-Slanted }{} \DeclareFontShape{TS1}{fco}{l}{sc}{ - <->\comfortaa@scale ts1-Comfortaa-Thin + <->\comfortaa@scale ts1-Comfortaa-Light }{} \DeclareFontShape{TS1}{fco}{l}{scsl}{ - <->\comfortaa@scale ts1-Comfortaa-Thin-Slanted + <->\comfortaa@scale ts1-Comfortaa-Light-Slanted }{} \DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/m/sl}{} diff --git a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd index 2be5facbe13..47d8133b613 100644 --- a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd +++ b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{x2fco.fd} - [2011/01/11 Fontinst v1.927 font definitions for X2/fco.] + [2011/03/24 Fontinst v1.927 font definitions for X2/fco.] \expandafter\ifx\csname comfortaa@scale\endcsname\relax \let\comfortaa@scale\@empty @@ -46,19 +46,19 @@ }{} \DeclareFontShape{X2}{fco}{l}{n}{ - <->\comfortaa@scale x2-Comfortaa-Thin + <->\comfortaa@scale x2-Comfortaa-Light }{} \DeclareFontShape{X2}{fco}{l}{sl}{ - <->\comfortaa@scale x2-Comfortaa-Thin-Slanted + <->\comfortaa@scale x2-Comfortaa-Light-Slanted }{} \DeclareFontShape{X2}{fco}{l}{sc}{ - <->\comfortaa@scale x2-Comfortaa-Thin-SmallCaps + <->\comfortaa@scale x2-Comfortaa-Light-SmallCaps }{} \DeclareFontShape{X2}{fco}{l}{scsl}{ - <->\comfortaa@scale x2-Comfortaa-Thin-Slanted-SmallCaps + <->\comfortaa@scale x2-Comfortaa-Light-Slanted-SmallCaps }{} \DeclareFontShape{X2}{fco}{m}{it}{<->ssub * fco/m/sl}{} -- cgit v1.2.3