comfortaa (31dec11)

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

28 files changed, 253 insertions, 248 deletions

diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index 88993b98f70..f4615a4ffab 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -17,3 +17,7 @@ Changelog for version 2.0:
 	- rename .vf and .tfm files based on the pattern <font>-<encoding>
 	- modify paths of the archive: documentation is now in
           doc/fonts/comfortaa/ and sources in source/fonts/comfortaa/
+
+Changelog for version 2.1:
+	  - fix bad weight substitution when using light weight and slanted
+            shape
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index d7b32665e76..753bf5df605 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 2.0
+ Comfortaa, version 2.1
 ------------------------
 
 Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
index ddd94a299d6..d05c7248d7d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
index f274b9b40e1..87424c5573d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
index a4f2dfdb8a8..4d715ef9ddc 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
@@ -38,7 +38,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Comfortaa\\Version~2.0}
+\title{\LaTeX{} support for Comfortaa\\Version~2.1}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
index 41859ffb218..e2905676296 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
@@ -1,254 +1,254 @@
-./README
-./tex/latex/comfortaa/ot1fco.fd
-./tex/latex/comfortaa/t2cfco.fd
-./tex/latex/comfortaa/t1fco.fd
-./tex/latex/comfortaa/comfortaa.sty
-./tex/latex/comfortaa/x2fco.fd
-./tex/latex/comfortaa/ts1fco.fd
-./tex/latex/comfortaa/t2bfco.fd
-./tex/latex/comfortaa/lgrfco.fd
-./tex/latex/comfortaa/t2afco.fd
-./doc/fonts/comfortaa/README
-./doc/fonts/comfortaa/comfortaa-samples.pdf
-./doc/fonts/comfortaa/comfortaa.tex
-./doc/fonts/comfortaa/CHANGES
-./doc/fonts/comfortaa/comfortaa.pdf
-./doc/fonts/comfortaa/comfortaa-samples.tex
-./source/fonts/comfortaa/ttf2type1.pe
+./source/fonts/comfortaa/comfortaa-fixgreek.mtx
 ./source/fonts/comfortaa/comfortaa-drv.tex
-./source/fonts/comfortaa/comfortaa-dotlessj.etx
-./source/fonts/comfortaa/comfortaa-fixlatin.mtx
-./source/fonts/comfortaa/Makefile
 ./source/fonts/comfortaa/comfortaa-map.tex
-./source/fonts/comfortaa/comfortaa-01.etx
 ./source/fonts/comfortaa/comfortaa-03.etx
+./source/fonts/comfortaa/comfortaa-dotlessj.etx
+./source/fonts/comfortaa/Makefile
+./source/fonts/comfortaa/comfortaa-fixlatin.mtx
 ./source/fonts/comfortaa/comfortaa-diacritics.mtx
-./source/fonts/comfortaa/comfortaa-02.etx
+./source/fonts/comfortaa/comfortaa-01.etx
+./source/fonts/comfortaa/ttf2type1.pe
 ./source/fonts/comfortaa/comfortaa-fixcyrillic.mtx
-./source/fonts/comfortaa/comfortaa-fixgreek.mtx
+./source/fonts/comfortaa/comfortaa-02.etx
 ./source/fonts/comfortaa/comfortaa-fixtextcomp.mtx
-./manifest.txt
+./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Bold-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
 ./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
+./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
 ./fonts/map/dvips/comfortaa/comfortaa.map
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
+./fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
+./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
+./fonts/afm/public/comfortaa/Comfortaa-Light.afm
+./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
+./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
 ./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
-./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
-./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
-./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Light.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
-./fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
-./fonts/enc/dvips/comfortaa/comfortaa-02.enc
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
+./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
+./fonts/enc/dvips/comfortaa/comfortaa-03.enc
 ./fonts/enc/dvips/comfortaa/comfortaa-01.enc
+./fonts/enc/dvips/comfortaa/comfortaa-02.enc
 ./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
-./fonts/enc/dvips/comfortaa/comfortaa-03.enc
-./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Light.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
+./tex/latex/comfortaa/t2bfco.fd
+./tex/latex/comfortaa/ts1fco.fd
+./tex/latex/comfortaa/t2afco.fd
+./tex/latex/comfortaa/ot1fco.fd
+./tex/latex/comfortaa/t1fco.fd
+./tex/latex/comfortaa/t2cfco.fd
+./tex/latex/comfortaa/x2fco.fd
+./tex/latex/comfortaa/comfortaa.sty
+./tex/latex/comfortaa/lgrfco.fd
+./manifest.txt
+./doc/fonts/comfortaa/CHANGES
+./doc/fonts/comfortaa/comfortaa.pdf
+./doc/fonts/comfortaa/comfortaa-samples.pdf
+./doc/fonts/comfortaa/comfortaa-samples.tex
+./doc/fonts/comfortaa/comfortaa.tex
+./doc/fonts/comfortaa/README
+./README
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
index cab17030a5e..0372bee64e1 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20110222
-Comment Creation Date: Sun Aug 21 19:55:55 2011
+Comment Creation Date: Sun Dec 25 23:35:49 2011
 FontName Comfortaa-Bold
 FullName Comfortaa-Bold
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
index 2a9da7e5c7c..2476b5e2415 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20110222
-Comment Creation Date: Sun Aug 21 19:55:55 2011
+Comment Creation Date: Sun Dec 25 23:35:49 2011
 FontName Comfortaa-Light
 FullName Comfortaa-Light
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
index 0681965fe42..d750894afac 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Regular.afm
@@ -1,6 +1,6 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20110222
-Comment Creation Date: Sun Aug 21 19:55:54 2011
+Comment Creation Date: Sun Dec 25 23:35:49 2011
 FontName Comfortaa
 FullName Comfortaa
 FamilyName Comfortaa
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc
index c2783fa0c9a..abb368aea13 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-01.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-01.etx",
 %    version = "See file comfortaa-01.etx",
-%    date = "generated 2011/08/21",
+%    date = "generated 2011/12/25",
 %    filename = "comfortaa-01.enc",
 %    email = "See file comfortaa-01.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc
index f8ef3001849..72833211620 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-02.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-02.etx",
 %    version = "See file comfortaa-02.etx",
-%    date = "generated 2011/08/21",
+%    date = "generated 2011/12/25",
 %    filename = "comfortaa-02.enc",
 %    email = "See file comfortaa-02.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc
index 2f18f6d9129..91586354b2b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-03.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-03.etx",
 %    version = "See file comfortaa-03.etx",
-%    date = "generated 2011/08/21",
+%    date = "generated 2011/12/25",
 %    filename = "comfortaa-03.enc",
 %    email = "See file comfortaa-03.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
index 39010afb741..2842842e112 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-dotlessj.etx",
 %    version = "See file comfortaa-dotlessj.etx",
-%    date = "generated 2011/08/21",
+%    date = "generated 2011/12/25",
 %    filename = "comfortaa-dotlessj.enc",
 %    email = "See file comfortaa-dotlessj.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
index db385bc4e8e..baec76c5df8 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
index 377edae335b..d221aa8ba02 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
index a94acc4d3a3..6624887605a 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
index 65d82b4ffaa..3d46f8be626 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
index 9dbd79c9a73..a4ca04419f3 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
diff --git a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
index aeb01a885b9..dd6ec45a111 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
diff --git a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex
index 1c594250c96..506e0582387 100644
--- a/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex
+++ b/Master/texmf-dist/source/fonts/comfortaa/comfortaa-drv.tex
@@ -20,6 +20,7 @@
 \setint{smallcapsscale}{800}
 
 \substitutesilent{scit}{scsl}
+\substitutesilent{l}{l}
 
 
 \recordtransforms{comfortaa-rec.tex}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
index b9739eac6e6..a9d970f0505 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/lgrfco.fd
@@ -1,11 +1,11 @@
 %Filename: lgrfco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{lgrfco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for LGR/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for LGR/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{LGR}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
index cf1deb77561..5652d9c0caa 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/ot1fco.fd
@@ -1,11 +1,11 @@
 %Filename: ot1fco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ot1fco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for OT1/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for OT1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{OT1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
index 74895d17c33..b1971cc2798 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t1fco.fd
@@ -1,11 +1,11 @@
 %Filename: t1fco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t1fco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for T1/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for T1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{T1}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
index 559f58f4348..6efa03fa39f 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2afco.fd
@@ -1,11 +1,11 @@
 %Filename: t2afco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2afco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for T2A/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for T2A/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{T2A}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
index 55afd682259..d2874c1ea86 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2bfco.fd
@@ -1,11 +1,11 @@
 %Filename: t2bfco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2bfco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for T2B/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for T2B/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{T2B}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
index 0ef601b66d7..79caa84f9a4 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/t2cfco.fd
@@ -1,11 +1,11 @@
 %Filename: t2cfco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{t2cfco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for T2C/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for T2C/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{T2C}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
index 880af5fcf70..c73a2cee1c3 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/ts1fco.fd
@@ -1,11 +1,11 @@
 %Filename: ts1fco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{ts1fco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for TS1/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for TS1/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{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}{}
diff --git a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
index c76da021732..dfb163736b8 100644
--- a/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
+++ b/Master/texmf-dist/tex/latex/comfortaa/x2fco.fd
@@ -1,11 +1,11 @@
 %Filename: x2fco.fd
 %Created by: tex comfortaa-drv
-%Created using fontinst v1.927
+%Created using fontinst v1.933
 
 %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
 
 \ProvidesFile{x2fco.fd}
-   [2011/08/21 Fontinst v1.927 font definitions for X2/fco.]
+   [2011/12/25 Fontinst v1.933 font definitions for X2/fco.]
 
 \expandafter\ifx\csname comfortaa@scale\endcsname\relax
   \let\comfortaa@scale\@empty
@@ -62,9 +62,9 @@
 }{}
 
 \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}{m}{it}{<->ssub * fco/m/sl}{}
+\DeclareFontShape{X2}{fco}{m}{scit}{<->ssub * fco/m/scsl}{}
 \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}{}