comfortaa (24dec10)

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

9 files changed, 36 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
index 653b0dfb382..bfb54a17927 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
+++ b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{comfortaa}[2010/12/02 Comfortaa]
+\ProvidesPackage{comfortaa}[2010/12/18 Comfortaa]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
@@ -28,25 +28,25 @@
   \x%
 }
 
-\newcommand{\comfortaa@series}{m}
+\newcommand{\comfortaa@series@normal}{m}
 
 \DeclareOption{regular}{%
-  \renewcommand{\comfortaa@series}{m}%
+  \renewcommand{\comfortaa@series@normal}{m}%
 }
 
 \DeclareOption{light}{%
-  \renewcommand{\comfortaa@series}{l}%
+  \renewcommand{\comfortaa@series@normal}{l}%
 }
 
 \DeclareOption{defaultsans}{%
   \renewcommand*{\sfdefault}{fco}%
-  \renewcommand*{\mddefault}{\comfortaa@series}%
+  \renewcommand*{\mddefault}{\comfortaa@series@normal}%
 }
 
 \DeclareOption{default}{%
   \renewcommand*{\familydefault}{fco}%
   \renewcommand*{\sfdefault}{fco}%
-  \renewcommand*{\mddefault}{\comfortaa@series}%
+  \renewcommand*{\mddefault}{\comfortaa@series@normal}%
 }
 
 \ProcessOptions*
@@ -63,7 +63,7 @@
 
 \newcommand{\fcofamily}{%
   \fontfamily{fco}%
-  \fontseries{\comfortaa@series}%
+  \fontseries{\comfortaa@series@normal}%
   \selectfont%
 }
 
diff --git a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
index c2e71891440..e697022d322 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}
-   [2010/12/04 Fontinst v1.927 font definitions for LGR/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for LGR/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
index 8671e0a97a2..1c165b19d52 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}
-   [2010/12/04 Fontinst v1.927 font definitions for OT1/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for OT1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
index b62fa2af509..e6beafbcaee 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}
-   [2010/12/04 Fontinst v1.927 font definitions for T1/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for T1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
index 24dc426268e..7a0b813e578 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}
-   [2010/12/04 Fontinst v1.927 font definitions for T2A/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for T2A/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
index 1f017803f12..6ed884b8ce6 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}
-   [2010/12/04 Fontinst v1.927 font definitions for T2B/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for T2B/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
index 5569a7d7cf5..978e6832bbb 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}
-   [2010/12/04 Fontinst v1.927 font definitions for T2C/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for T2C/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
index 04946c1c18a..a73553596cf 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}
-   [2010/12/04 Fontinst v1.927 font definitions for TS1/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for TS1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -23,14 +23,10 @@
 
 \DeclareFontShape{TS1}{fco}{m}{sc}{
    <->\comfortaa@scale ts1-Comfortaa-Regular
-   <->\comfortaa@scale ts1-Comfortaa-Bold
-   <->\comfortaa@scale ts1-Comfortaa-Thin
 }{}
 
 \DeclareFontShape{TS1}{fco}{m}{scsl}{
    <->\comfortaa@scale ts1-Comfortaa-Regular-Slanted
-   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
-   <->\comfortaa@scale ts1-Comfortaa-Thin-Slanted
 }{}
 
 \DeclareFontShape{TS1}{fco}{b}{n}{
@@ -41,6 +37,14 @@
    <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
 }{}
 
+\DeclareFontShape{TS1}{fco}{b}{sc}{
+   <->\comfortaa@scale ts1-Comfortaa-Bold
+}{}
+
+\DeclareFontShape{TS1}{fco}{b}{scsl}{
+   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
+}{}
+
 \DeclareFontShape{TS1}{fco}{l}{n}{
    <->\comfortaa@scale ts1-Comfortaa-Thin
 }{}
@@ -49,12 +53,25 @@
    <->\comfortaa@scale ts1-Comfortaa-Thin-Slanted
 }{}
 
+\DeclareFontShape{TS1}{fco}{l}{sc}{
+   <->\comfortaa@scale ts1-Comfortaa-Thin
+}{}
+
+\DeclareFontShape{TS1}{fco}{l}{scsl}{
+   <->\comfortaa@scale ts1-Comfortaa-Thin-Slanted
+}{}
+
 \DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
 \DeclareFontShape{TS1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \DeclareFontShape{TS1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{TS1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{TS1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{TS1}{fco}{bx}{it}{<->ssub * fco/b/it}{}
+\DeclareFontShape{TS1}{fco}{bx}{sc}{<->ssub * fco/b/sc}{}
+\DeclareFontShape{TS1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
+\DeclareFontShape{TS1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
+\DeclareFontShape{TS1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
 \DeclareFontShape{TS1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{TS1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
index 6dcf82b0213..77bc8c442ba 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}
-   [2010/12/04 Fontinst v1.927 font definitions for X2/fco.]
+   [2010/12/18 Fontinst v1.927 font definitions for X2/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty