comfortaa 2.0 (23aug11)

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

9 files changed, 234 insertions, 234 deletions

diff --git a/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty b/Master/texmf-dist/tex/latex/comfortaa/comfortaa.sty
index fa5659a22c9..612e5ad219d 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, 2011 Mohamed El Morabity
+%% Copyright 2011 Mohamed El Morabity
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License, either version 1.3 of this license or (at your option)
@@ -14,7 +14,7 @@
 % This work consists of all files listed in manifest.txt.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{comfortaa}[2011/03/24 Comfortaa]
+\ProvidesPackage{comfortaa}[2011/08/14 Comfortaa]
 
 \RequirePackage{keyval}
 \RequirePackage{slantsc}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
index cb7ae9167f4..b9739eac6e6 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/03/24 Fontinst v1.927 font definitions for LGR/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for LGR/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{LGR}{fco}{}
 
-\DeclareFontShape{LGR}{fco}{m}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular
+\DeclareFontShape{LGR}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-Slanted
+\DeclareFontShape{LGR}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{LGR}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold
+\DeclareFontShape{LGR}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-Slanted
+\DeclareFontShape{LGR}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{LGR}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{b}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{n}{
-   <->\comfortaa@scale lgr-Comfortaa-Light
+\DeclareFontShape{LGR}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{sl}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-Slanted
+\DeclareFontShape{LGR}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{sc}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-SmallCaps
+\DeclareFontShape{LGR}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{l}{scsl}{
-   <->\comfortaa@scale lgr-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{LGR}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-lgr
 }{}
 
-\DeclareFontShape{LGR}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{LGR}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{LGR}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{LGR}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{LGR}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{LGR}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{LGR}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{LGR}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{LGR}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{LGR}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{LGR}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{LGR}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{LGR}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{LGR}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
index b9af7d9bc24..cf1deb77561 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/03/24 Fontinst v1.927 font definitions for OT1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for OT1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{OT1}{fco}{}
 
-\DeclareFontShape{OT1}{fco}{m}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular
+\DeclareFontShape{OT1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-Slanted
+\DeclareFontShape{OT1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{OT1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold
+\DeclareFontShape{OT1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-Slanted
+\DeclareFontShape{OT1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{OT1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{b}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{n}{
-   <->\comfortaa@scale ot1-Comfortaa-Light
+\DeclareFontShape{OT1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{sl}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-Slanted
+\DeclareFontShape{OT1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{sc}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-SmallCaps
+\DeclareFontShape{OT1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{l}{scsl}{
-   <->\comfortaa@scale ot1-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{OT1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-ot1
 }{}
 
-\DeclareFontShape{OT1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{OT1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{OT1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{OT1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{OT1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{OT1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{OT1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{OT1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{OT1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{OT1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{OT1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{OT1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{OT1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{OT1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
index 043400edd06..74895d17c33 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/03/24 Fontinst v1.927 font definitions for T1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T1}{fco}{}
 
-\DeclareFontShape{T1}{fco}{m}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Regular
+\DeclareFontShape{T1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-Slanted
+\DeclareFontShape{T1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Bold
+\DeclareFontShape{T1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-Slanted
+\DeclareFontShape{T1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{b}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{n}{
-   <->\comfortaa@scale t1-Comfortaa-Light
+\DeclareFontShape{T1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{sl}{
-   <->\comfortaa@scale t1-Comfortaa-Light-Slanted
+\DeclareFontShape{T1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{sc}{
-   <->\comfortaa@scale t1-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{l}{scsl}{
-   <->\comfortaa@scale t1-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t1
 }{}
 
-\DeclareFontShape{T1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T1}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T1}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T1}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T1}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T1}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T1}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
index b74b0a0c30b..559f58f4348 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/03/24 Fontinst v1.927 font definitions for T2A/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2A/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2A}{fco}{}
 
-\DeclareFontShape{T2A}{fco}{m}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular
+\DeclareFontShape{T2A}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2A}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2A}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold
+\DeclareFontShape{T2A}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2A}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2A}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{n}{
-   <->\comfortaa@scale t2a-Comfortaa-Light
+\DeclareFontShape{T2A}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{sl}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-Slanted
+\DeclareFontShape{T2A}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{sc}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2A}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2a-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2A}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2a
 }{}
 
-\DeclareFontShape{T2A}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2A}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2A}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2A}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2A}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2A}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2A}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2A}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2A}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2A}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2A}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2A}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2A}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2A}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
index e1dbffa6056..55afd682259 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/03/24 Fontinst v1.927 font definitions for T2B/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2B/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2B}{fco}{}
 
-\DeclareFontShape{T2B}{fco}{m}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular
+\DeclareFontShape{T2B}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2B}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2B}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold
+\DeclareFontShape{T2B}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2B}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2B}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{n}{
-   <->\comfortaa@scale t2b-Comfortaa-Light
+\DeclareFontShape{T2B}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{sl}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-Slanted
+\DeclareFontShape{T2B}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{sc}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2B}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2b-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2B}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2b
 }{}
 
-\DeclareFontShape{T2B}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2B}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2B}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2B}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2B}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2B}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2B}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2B}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2B}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2B}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2B}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2B}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2B}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2B}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
index 909efa9bfeb..0ef601b66d7 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/03/24 Fontinst v1.927 font definitions for T2C/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for T2C/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{T2C}{fco}{}
 
-\DeclareFontShape{T2C}{fco}{m}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular
+\DeclareFontShape{T2C}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-Slanted
+\DeclareFontShape{T2C}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{T2C}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold
+\DeclareFontShape{T2C}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-Slanted
+\DeclareFontShape{T2C}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{T2C}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{b}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{n}{
-   <->\comfortaa@scale t2c-Comfortaa-Light
+\DeclareFontShape{T2C}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{sl}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-Slanted
+\DeclareFontShape{T2C}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{sc}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-SmallCaps
+\DeclareFontShape{T2C}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{l}{scsl}{
-   <->\comfortaa@scale t2c-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{T2C}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-t2c
 }{}
 
-\DeclareFontShape{T2C}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{T2C}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{T2C}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{T2C}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{T2C}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{T2C}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{T2C}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{T2C}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{T2C}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{T2C}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2C}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{T2C}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{T2C}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{T2C}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
index 74a903a6eb1..880af5fcf70 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/03/24 Fontinst v1.927 font definitions for TS1/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for TS1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{TS1}{fco}{}
 
-\DeclareFontShape{TS1}{fco}{m}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular
+\DeclareFontShape{TS1}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular-Slanted
+\DeclareFontShape{TS1}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular
+\DeclareFontShape{TS1}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Regular-Slanted
+\DeclareFontShape{TS1}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold
+\DeclareFontShape{TS1}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
+\DeclareFontShape{TS1}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold
+\DeclareFontShape{TS1}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{b}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Bold-Slanted
+\DeclareFontShape{TS1}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{n}{
-   <->\comfortaa@scale ts1-Comfortaa-Light
+\DeclareFontShape{TS1}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{sl}{
-   <->\comfortaa@scale ts1-Comfortaa-Light-Slanted
+\DeclareFontShape{TS1}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{sc}{
-   <->\comfortaa@scale ts1-Comfortaa-Light
+\DeclareFontShape{TS1}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{l}{scsl}{
-   <->\comfortaa@scale ts1-Comfortaa-Light-Slanted
+\DeclareFontShape{TS1}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-ts1
 }{}
 
-\DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{TS1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{TS1}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{TS1}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{TS1}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{TS1}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \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}{}
@@ -71,7 +73,5 @@
 \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 47d8133b613..c76da021732 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/03/24 Fontinst v1.927 font definitions for X2/fco.]
+   [2011/08/21 Fontinst v1.927 font definitions for X2/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -13,56 +13,58 @@
 
 \DeclareFontFamily{X2}{fco}{}
 
-\DeclareFontShape{X2}{fco}{m}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Regular
+\DeclareFontShape{X2}{fco}{l}{n}{
+   <->\comfortaa@scale Comfortaa-Light-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-Slanted
+\DeclareFontShape{X2}{fco}{l}{sl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-SmallCaps
+\DeclareFontShape{X2}{fco}{l}{sc}{
+   <->\comfortaa@scale Comfortaa-Light-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Regular-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{l}{scsl}{
+   <->\comfortaa@scale Comfortaa-Light-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Bold
+\DeclareFontShape{X2}{fco}{m}{n}{
+   <->\comfortaa@scale Comfortaa-Regular-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-Slanted
+\DeclareFontShape{X2}{fco}{m}{sl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-SmallCaps
+\DeclareFontShape{X2}{fco}{m}{sc}{
+   <->\comfortaa@scale Comfortaa-Regular-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{b}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Bold-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{m}{scsl}{
+   <->\comfortaa@scale Comfortaa-Regular-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{n}{
-   <->\comfortaa@scale x2-Comfortaa-Light
+\DeclareFontShape{X2}{fco}{b}{n}{
+   <->\comfortaa@scale Comfortaa-Bold-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{sl}{
-   <->\comfortaa@scale x2-Comfortaa-Light-Slanted
+\DeclareFontShape{X2}{fco}{b}{sl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{sc}{
-   <->\comfortaa@scale x2-Comfortaa-Light-SmallCaps
+\DeclareFontShape{X2}{fco}{b}{sc}{
+   <->\comfortaa@scale Comfortaa-Bold-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{l}{scsl}{
-   <->\comfortaa@scale x2-Comfortaa-Light-Slanted-SmallCaps
+\DeclareFontShape{X2}{fco}{b}{scsl}{
+   <->\comfortaa@scale Comfortaa-Bold-Slanted-SmallCaps-x2
 }{}
 
-\DeclareFontShape{X2}{fco}{m}{it}{<->ssub * fco/m/sl}{}
-\DeclareFontShape{X2}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
+\DeclareFontShape{X2}{fco}{l}{it}{<->ssub * fco/l/sl}{}
+\DeclareFontShape{X2}{fco}{m}{it}{<->ssub * fco/l/it}{}
+\DeclareFontShape{X2}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
+\DeclareFontShape{X2}{fco}{m}{scit}{<->ssub * fco/l/scit}{}
 \DeclareFontShape{X2}{fco}{bx}{n}{<->ssub * fco/b/n}{}
 \DeclareFontShape{X2}{fco}{bx}{sl}{<->ssub * fco/b/sl}{}
 \DeclareFontShape{X2}{fco}{b}{it}{<->ssub * fco/b/sl}{}
@@ -71,7 +73,5 @@
 \DeclareFontShape{X2}{fco}{bx}{scsl}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{X2}{fco}{b}{scit}{<->ssub * fco/b/scsl}{}
 \DeclareFontShape{X2}{fco}{bx}{scit}{<->ssub * fco/b/scit}{}
-\DeclareFontShape{X2}{fco}{l}{it}{<->ssub * fco/l/sl}{}
-\DeclareFontShape{X2}{fco}{l}{scit}{<->ssub * fco/l/scsl}{}
 
 \endinput