comfortaa (8may11)

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

150 files changed, 673 insertions, 546 deletions

diff --git a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
index 9078da0396a..ff4bfec15e3 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
+++ b/Master/texmf-dist/doc/fonts/comfortaa/CHANGES
@@ -6,3 +6,8 @@ Changelog for version 1.2:
 
 Changelog for version 1.3:
 	- fix comfortaa-fixglyphs.mtx
+
+Changelog for version 1.4:
+	- remove "light" class option
+	- fix documentation
+	- add samples PDF
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README b/Master/texmf-dist/doc/fonts/comfortaa/README
index 50b97906fc6..795f15ac79d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README
+++ b/Master/texmf-dist/doc/fonts/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 1.3
+ Comfortaa, version 1.4
 ------------------------
 
 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
new file mode 100644
index 00000000000..37bd2281926
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
new file mode 100644
index 00000000000..554a517dd17
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-samples.tex
@@ -0,0 +1,89 @@
+%% comfortaa-samples.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[greek,russian,francais,american]{babel}
+\usepackage{comfortaa}
+\usepackage[LGR,T2A,T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\newcommand{\latinSample}{%
+  \foreignlanguage{francais}{%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+  }%
+}
+
+\newcommand{\cyrillicSample}{%
+  \foreignlanguage{russian}{%
+    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
+  }%
+}
+
+\newcommand{\greekSample}{%
+  \foreignlanguage{greek}{%
+    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
+  }%
+}
+
+\newcommand{\miscSample}{%
+  0123456789 fi fl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+  {\usefont{T1}{fco}{#1}{#2} \latinSample}
+
+  {\usefont{T2A}{fco}{#1}{#2} \cyrillicSample}
+
+  {\usefont{LGR}{fco}{#1}{#2} \greekSample}%
+
+  {\fontfamily{fco}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Comfortaa Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\section*{Comfortaa Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scsl}
+
+\section*{Comfortaa Light}
+
+\fontSample{l}{n}
+
+\fontSample{l}{sl}
+
+\fontSample{l}{sc}
+
+\fontSample{l}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.pdf
index d2af93a7a7f..2eeae2bc5bf 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 0325ad745fc..cf781b72937 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
+++ b/Master/texmf-dist/doc/fonts/comfortaa/comfortaa.tex
@@ -1,5 +1,5 @@
 %% comfortaa.tex
-%% 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)
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.3}
+\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.4}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -87,10 +87,11 @@ work.
 \subsection{Calling Comfortaa}
 
 You can use the Comfortaa font in a \LaTeX{} document by adding the command
-\begin{verbatim} \usepackage{comfortaa}
+\begin{verbatim}
+\usepackage{comfortaa}
 \end{verbatim}
-to the preamble. The package supplies the
-\code{\char`\\fcofamily} command to switch the current font to Comfortaa.
+to the preamble.  The package supplies the \code{\char`\\fcofamily} command to
+switch the current font to Comfortaa.
 
 \subsubsection{Options}
 
@@ -106,20 +107,6 @@ To set Comfortaa as default sans-serif only:
 \usepackage[defaultsans]{comfortaa}
 \end{verbatim}
 
-\paragraph{Default weight}
-
-The following options specify which weight of the font you prefer to use:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    \code{regular}&{\fcofamily\fontseries{m}\selectfont use regular face}\\
-    \midrule
-    \code{light}&{\fcofamily\fontseries{l}\selectfont use light face}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-The \code{regular} option is enabled by default.
-
 \paragraph{Font scaling}
 
 The font can be up- and downscaled by any factor. This can be used to make
@@ -130,7 +117,6 @@ the font according to \parameter{ratio} (1.0 by default), for example:
 \usepackage[scale=0.95]{comfortaa}
 \end{verbatim}
 
-
 \subsection{Encodings}
 
 The following encodings are supported:
@@ -156,9 +142,9 @@ treated poorly, if at all. Note difference in kerning between e.g.
 \begin{center}
   \begin{tabular}{ll}
     \toprule
-    OT1-encoded&To Ta Té\\
+    OT1-encoded&{\fcofamily To Ta Té}\\
     \midrule
-    T1-encoded&\fontencoding{T1}\selectfont To Ta Té\\
+    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
index d29a12b613f..8d3e8d8d072 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/comfortaa/manifest.txt
@@ -1,317 +1,321 @@
-./manifest.txt
-./source/comfortaa/comfortaa-fixlatin.etx
-./source/comfortaa/comfortaa-dotlessj.etx
-./source/comfortaa/ttf2type1.pe
-./source/comfortaa/comfortaa-drv.tex
-./source/comfortaa/comfortaa.tex
-./source/comfortaa/comfortaa-fixglyphs.mtx
-./source/comfortaa/comfortaa.pdf
-./source/comfortaa/comfortaa-fixcyrillic.etx
-./source/comfortaa/comfortaa-fixtextcomp.etx
-./source/comfortaa/comfortaa-fixgreek.etx
-./source/comfortaa/Makefile
-./source/comfortaa/CHANGES
-./source/comfortaa/comfortaa-map.tex
-./source/comfortaa/comfortaa-reglyph.tex
-./source/comfortaa/README
+./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
+./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
 ./fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Thin-LCDFJ.pfb
+./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Thin.pfb
 ./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin.tfm
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
+./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
+./fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
+./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
+./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
+./fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf
+./fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
+./fonts/map/dvips/comfortaa/comfortaa.map
+./fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
+./fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
+./fonts/enc/dvips/comfortaa/comfortaa-x2.enc
+./fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
+./fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
+./fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
+./fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
+./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
+./fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
+./fonts/enc/dvips/comfortaa/comfortaa-t1.enc
+./fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
+./fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
+./fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
 ./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
 ./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
 ./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin.tfm
+./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm
 ./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold-Slanted.tfm
 ./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
 ./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
 ./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
 ./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
 ./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin.tfm
 ./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Bold.tfm
 ./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular.tfm
 ./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Bold-Slanted.tfm
 ./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
 ./fonts/tfm/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
 ./fonts/tfm/public/comfortaa/t2a-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/t2a-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold.tfm
+./fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Bold.tfm
 ./fonts/tfm/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.tfm
-./fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Bold.tfm
-./fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular.tfm
-./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Regular-Slanted.tfm
-./fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Bold-Slanted.tfm
-./fonts/map/dvips/comfortaa/comfortaa.map
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Regular-Slanted.vf
-./fonts/vf/public/comfortaa/ot1-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2a-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Bold-Slanted.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted.vf
-./fonts/vf/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/t2b-Comfortaa-Regular-Slanted-SmallCaps.vf
-./fonts/vf/public/comfortaa/ts1-Comfortaa-Regular.vf
-./fonts/vf/public/comfortaa/t2c-Comfortaa-Bold-SmallCaps.vf
-./fonts/vf/public/comfortaa/lgr-Comfortaa-Thin.vf
-./fonts/vf/public/comfortaa/x2-Comfortaa-Bold-Slanted-SmallCaps.vf
-./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Thin.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm
+./fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/lgr-Comfortaa-Regular-SmallCaps.tfm
+./fonts/tfm/public/comfortaa/t2b-Comfortaa-Regular-Slanted.tfm
+./fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Regular.tfm
+./fonts/tfm/public/comfortaa/ts1-Comfortaa-Bold-Slanted.tfm
+./fonts/tfm/public/comfortaa/t1-Comfortaa-Bold-Slanted-SmallCaps.tfm
 ./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Thin-LCDFJ.afm
 ./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
-./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Thin.ttf
-./fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
-./fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
-./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
-./fonts/enc/dvips/comfortaa/comfortaa-t1.enc
-./fonts/enc/dvips/comfortaa/comfortaa-x2.enc
-./fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
+./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-Light-LCDFJ.afm
+./source/comfortaa/comfortaa.tex
+./source/comfortaa/comfortaa-fixlatin.etx
+./source/comfortaa/comfortaa-samples.pdf
+./source/comfortaa/Makefile
+./source/comfortaa/comfortaa-reglyph.tex
+./source/comfortaa/ttf2type1.pe
+./source/comfortaa/comfortaa-fixtextcomp.etx
+./source/comfortaa/CHANGES
+./source/comfortaa/comfortaa-map.tex
+./source/comfortaa/comfortaa-dotlessj.etx
+./source/comfortaa/comfortaa.pdf
+./source/comfortaa/comfortaa-fixgreek.etx
+./source/comfortaa/comfortaa-fixcyrillic.etx
+./source/comfortaa/comfortaa-samples.tex
+./source/comfortaa/README
+./source/comfortaa/comfortaa-drv.tex
+./source/comfortaa/comfortaa-fixglyphs.mtx
 ./doc/latex/comfortaa/comfortaa.tex
-./doc/latex/comfortaa/comfortaa.pdf
+./doc/latex/comfortaa/comfortaa-samples.pdf
 ./doc/latex/comfortaa/CHANGES
+./doc/latex/comfortaa/comfortaa.pdf
+./doc/latex/comfortaa/comfortaa-samples.tex
 ./doc/latex/comfortaa/README
 ./README
+./tex/latex/comfortaa/ts1fco.fd
+./tex/latex/comfortaa/x2fco.fd
+./tex/latex/comfortaa/comfortaa.sty
 ./tex/latex/comfortaa/t2cfco.fd
+./tex/latex/comfortaa/t2bfco.fd
 ./tex/latex/comfortaa/t1fco.fd
-./tex/latex/comfortaa/x2fco.fd
-./tex/latex/comfortaa/lgrfco.fd
-./tex/latex/comfortaa/ts1fco.fd
 ./tex/latex/comfortaa/ot1fco.fd
-./tex/latex/comfortaa/t2bfco.fd
-./tex/latex/comfortaa/comfortaa.sty
 ./tex/latex/comfortaa/t2afco.fd
+./tex/latex/comfortaa/lgrfco.fd
+./manifest.txt
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa
deleted file mode 100644
index 50b97906fc6..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/README.comfortaa
+++ /dev/null
@@ -1,22 +0,0 @@
-------------------------
- Comfortaa, version 1.3
-------------------------
-
-Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
-Aakerlund. This font, delivered under the OFL version 1.1, is available on
-Jonas's deviantArt web page at
-http://aajohan.deviantart.com/art/Comfortaa-font-105395949 as TrueType files.
-
-This package provides support for this font in LaTeX. It includes the original
-TrueType fonts, as well as Type 1 versions, converted for this package using
-FontForge for full support with Dvips.
-
-Installation and usage instructions are described in
-doc/latex/comfortaa/comfortaa.pdf.
-
-This package is released under the LaTeX Project Public License, either version
-1.3c or above, with the exception of the .ttf and .pfb files, released under the
-Open Font License version 1.1.
-
-If you have comments about the package, please contact Mohamed El Morabity
-(melmorabity AT fedoraproject DOT org).
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf b/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf
deleted file mode 100644
index d2af93a7a7f..00000000000
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
index 9f02e869b2b..f83f0d4de05 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
@@ -1,7 +1,7 @@
 StartFontMetrics 2.0
 Comment AFM Generated by Ghostscript/pf2afm
 FontName Comfortaa-BoldLCDFJ
-FullName Comfortaa Bold
+FullName Comfortaa-Bold
 FamilyName Comfortaa
 Weight Bold
 Notice Copyright (c) 20.07.2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/OFL
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 9942077a745..cc9d1ac4778 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Bold.afm
@@ -1,8 +1,8 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Tue Jan 11 15:38:10 2011
+Comment Creation Date: Thu Mar 24 00:46:52 2011
 FontName Comfortaa-Bold
-FullName Comfortaa Bold
+FullName Comfortaa-Bold
 FamilyName Comfortaa
 Weight Bold
 Notice (Copyright (c) 20.07.2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/)
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Thin-LCDFJ.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
index 1079d41e605..7be1d2a72e7 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Thin-LCDFJ.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
@@ -1,10 +1,10 @@
 StartFontMetrics 2.0
 Comment AFM Generated by Ghostscript/pf2afm
-FontName Comfortaa-ThinLCDFJ
-FullName Comfortaa Thin
+FontName Comfortaa-LightLCDFJ
+FullName Comfortaa-Light
 FamilyName Comfortaa
 Weight Light
-Notice Copyright (c) 20.07.2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/OFL
+Notice Copyright (c) 2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/OFL
 ItalicAngle 0
 IsFixedPitch false
 UnderlinePosition -142
diff --git a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Thin.afm b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
index ff0fced485e..b0db0c64a2c 100644
--- a/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Thin.afm
+++ b/Master/texmf-dist/fonts/afm/public/comfortaa/Comfortaa-Light.afm
@@ -1,12 +1,11 @@
 StartFontMetrics 2.0
 Comment Generated by FontForge 20100429
-Comment Creation Date: Tue Jan 11 15:38:10 2011
-FontName Comfortaa-Thin
-FullName Comfortaa Thin
+Comment Creation Date: Thu Mar 24 00:46:52 2011
+FontName Comfortaa-Light
+FullName Comfortaa-Light
 FamilyName Comfortaa
 Weight Light
-Notice (Copyright (c) 20.07.2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/)
-Comment OFL
+Notice (Copyright (c) 2010, Johan Aakerlund (aajohan@gmail.com), with Reserved Font Name "Comfortaa". This Font Software is licensed under the SIL Open Font License, Version 1.1. http://scripts.sil.org/OFL)
 ItalicAngle 0
 IsFixedPitch false
 UnderlinePosition -142
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 a9c40685426..4e8858b9aca 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 20100429
-Comment Creation Date: Tue Jan 11 15:38:10 2011
+Comment Creation Date: Thu Mar 24 00:46:52 2011
 FontName Comfortaa
 FullName Comfortaa
 FamilyName Comfortaa
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 63d1c99e3c6..16fa6f7e1dd 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/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-dotlessj.enc",
 %    email = "See file comfortaa-dotlessj.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
index 43cf113c4f6..f1a8376b1cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixcyrillic.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-fixcyrillic.etx",
 %    version = "See file comfortaa-fixcyrillic.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-fixcyrillic.enc",
 %    email = "See file comfortaa-fixcyrillic.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
index 99d5e6e414a..0cc34b7a6aa 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixgreek.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-fixgreek.etx",
 %    version = "See file comfortaa-fixgreek.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-fixgreek.enc",
 %    email = "See file comfortaa-fixgreek.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
index 8f21812f13f..c0df1e8a63e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixlatin.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-fixlatin.etx",
 %    version = "See file comfortaa-fixlatin.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-fixlatin.enc",
 %    email = "See file comfortaa-fixlatin.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
index 530a433ced0..58371fe7525 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-fixtextcomp.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file comfortaa-fixtextcomp.etx",
 %    version = "See file comfortaa-fixtextcomp.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-fixtextcomp.enc",
 %    email = "See file comfortaa-fixtextcomp.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
index efce47d15b4..f5be4b2f450 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-lgr.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file lgr.etx",
 %    version = "See file lgr.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-lgr.enc",
 %    email = "See file lgr.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
index 893e926f4d2..65866d4f16d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ot1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file ot1.etx",
 %    version = "See file ot1.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-ot1.enc",
 %    email = "See file ot1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc
index 634f209abe0..c052c9e64f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t1.etx",
 %    version = "See file t1.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-t1.enc",
 %    email = "See file t1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
index 3ccad2088fc..9b9680a5740 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2a.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2a.etx",
 %    version = "See file t2a.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-t2a.enc",
 %    email = "See file t2a.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
index 7de531e8390..446e8eea66e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2b.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2b.etx",
 %    version = "See file t2b.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-t2b.enc",
 %    email = "See file t2b.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
index 2cbe58f7bcd..43fe6b906fb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-t2c.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file t2c.etx",
 %    version = "See file t2c.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-t2c.enc",
 %    email = "See file t2c.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
index fa5f0e0b40d..b06e65bdc6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-ts1.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file ts1.etx",
 %    version = "See file ts1.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-ts1.enc",
 %    email = "See file ts1.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc
index d660a62d6d1..ed9999f1f2d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/comfortaa/comfortaa-x2.enc
@@ -2,7 +2,7 @@
 % @psencodingfile{
 %    author = "See file x2.etx",
 %    version = "See file x2.etx",
-%    date = "generated 2011/01/11",
+%    date = "generated 2011/03/24",
 %    filename = "comfortaa-x2.enc",
 %    email = "See file x2.etx",
 %    codetable = "ISO/ASCII",
diff --git a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
index c0a13436190..7a65e0b547d 100644
--- a/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
+++ b/Master/texmf-dist/fonts/map/dvips/comfortaa/comfortaa.map
@@ -10,18 +10,18 @@ raw-dotlessj-Comfortaa-Bold Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfort
 raw-ot1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-ot1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
 raw-fixlatin-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixlatin.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
 raw-dotlessj-Comfortaa-Bold-Slanted Comfortaa-BoldLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Bold-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
-raw-ot1-Comfortaa-Thin Comfortaa-Thin <comfortaa-ot1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-ot1 ReEncodeFont "
-raw-fixlatin-Comfortaa-Thin Comfortaa-Thin <comfortaa-fixlatin.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont "
-raw-dotlessj-Comfortaa-Thin Comfortaa-ThinLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Thin-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
-raw-ot1-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-ot1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
-raw-fixlatin-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-fixlatin.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
-raw-dotlessj-Comfortaa-Thin-Slanted Comfortaa-ThinLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Thin-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
+raw-ot1-Comfortaa-Light Comfortaa-Light <comfortaa-ot1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ot1 ReEncodeFont "
+raw-fixlatin-Comfortaa-Light Comfortaa-Light <comfortaa-fixlatin.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont "
+raw-dotlessj-Comfortaa-Light Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont "
+raw-ot1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-ot1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ot1 ReEncodeFont 0.167 SlantFont "
+raw-fixlatin-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixlatin.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixlatin ReEncodeFont 0.167 SlantFont "
+raw-dotlessj-Comfortaa-Light-Slanted Comfortaa-LightLCDFJ <comfortaa-dotlessj.enc <Comfortaa-Light-LCDFJ.pfb " fontinst-autoenc-comfortaa-dotlessj ReEncodeFont 0.167 SlantFont "
 raw-t1-Comfortaa-Regular Comfortaa <comfortaa-t1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont "
 raw-t1-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
 raw-t1-Comfortaa-Bold Comfortaa-Bold <comfortaa-t1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont "
 raw-t1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
-raw-t1-Comfortaa-Thin Comfortaa-Thin <comfortaa-t1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t1 ReEncodeFont "
-raw-t1-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-t1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
+raw-t1-Comfortaa-Light Comfortaa-Light <comfortaa-t1.enc <Comfortaa-Light.pfb " fontinst-autoenc-t1 ReEncodeFont "
+raw-t1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t1.enc <Comfortaa-Light.pfb " fontinst-autoenc-t1 ReEncodeFont 0.167 SlantFont "
 raw-fixtextcomp-Comfortaa-Regular Comfortaa <comfortaa-fixtextcomp.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
 raw-ts1-Comfortaa-Regular Comfortaa <comfortaa-ts1.enc <Comfortaa-Regular.pfb " fontinst-autoenc-ts1 ReEncodeFont "
 raw-fixtextcomp-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixtextcomp.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
@@ -30,10 +30,10 @@ raw-fixtextcomp-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixtextcomp.enc <Comfor
 raw-ts1-Comfortaa-Bold Comfortaa-Bold <comfortaa-ts1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont "
 raw-fixtextcomp-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixtextcomp.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
 raw-ts1-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-ts1.enc <Comfortaa-Bold.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
-raw-fixtextcomp-Comfortaa-Thin Comfortaa-Thin <comfortaa-fixtextcomp.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
-raw-ts1-Comfortaa-Thin Comfortaa-Thin <comfortaa-ts1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-ts1 ReEncodeFont "
-raw-fixtextcomp-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-fixtextcomp.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
-raw-ts1-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-ts1.enc <Comfortaa-Thin.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
+raw-fixtextcomp-Comfortaa-Light Comfortaa-Light <comfortaa-fixtextcomp.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont "
+raw-ts1-Comfortaa-Light Comfortaa-Light <comfortaa-ts1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ts1 ReEncodeFont "
+raw-fixtextcomp-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixtextcomp.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixtextcomp ReEncodeFont 0.167 SlantFont "
+raw-ts1-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-ts1.enc <Comfortaa-Light.pfb " fontinst-autoenc-ts1 ReEncodeFont 0.167 SlantFont "
 raw-t2a-Comfortaa-Regular Comfortaa <comfortaa-t2a.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2a ReEncodeFont "
 raw-fixcyrillic-Comfortaa-Regular Comfortaa <comfortaa-fixcyrillic.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
 raw-t2a-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2a.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
@@ -42,28 +42,28 @@ raw-t2a-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2a.enc <Comfortaa-Bold.pfb " f
 raw-fixcyrillic-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixcyrillic.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
 raw-t2a-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2a.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
 raw-fixcyrillic-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixcyrillic.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
-raw-t2a-Comfortaa-Thin Comfortaa-Thin <comfortaa-t2a.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2a ReEncodeFont "
-raw-fixcyrillic-Comfortaa-Thin Comfortaa-Thin <comfortaa-fixcyrillic.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
-raw-t2a-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-t2a.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
-raw-fixcyrillic-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-fixcyrillic.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
+raw-t2a-Comfortaa-Light Comfortaa-Light <comfortaa-t2a.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2a ReEncodeFont "
+raw-fixcyrillic-Comfortaa-Light Comfortaa-Light <comfortaa-fixcyrillic.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont "
+raw-t2a-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2a.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2a ReEncodeFont 0.167 SlantFont "
+raw-fixcyrillic-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixcyrillic.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixcyrillic ReEncodeFont 0.167 SlantFont "
 raw-t2b-Comfortaa-Regular Comfortaa <comfortaa-t2b.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2b ReEncodeFont "
 raw-t2b-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2b.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
 raw-t2b-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2b.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2b ReEncodeFont "
 raw-t2b-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2b.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
-raw-t2b-Comfortaa-Thin Comfortaa-Thin <comfortaa-t2b.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2b ReEncodeFont "
-raw-t2b-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-t2b.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
+raw-t2b-Comfortaa-Light Comfortaa-Light <comfortaa-t2b.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2b ReEncodeFont "
+raw-t2b-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2b.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2b ReEncodeFont 0.167 SlantFont "
 raw-t2c-Comfortaa-Regular Comfortaa <comfortaa-t2c.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2c ReEncodeFont "
 raw-t2c-Comfortaa-Regular-Slanted Comfortaa <comfortaa-t2c.enc <Comfortaa-Regular.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
 raw-t2c-Comfortaa-Bold Comfortaa-Bold <comfortaa-t2c.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2c ReEncodeFont "
 raw-t2c-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-t2c.enc <Comfortaa-Bold.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
-raw-t2c-Comfortaa-Thin Comfortaa-Thin <comfortaa-t2c.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2c ReEncodeFont "
-raw-t2c-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-t2c.enc <Comfortaa-Thin.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
+raw-t2c-Comfortaa-Light Comfortaa-Light <comfortaa-t2c.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2c ReEncodeFont "
+raw-t2c-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-t2c.enc <Comfortaa-Light.pfb " fontinst-autoenc-t2c ReEncodeFont 0.167 SlantFont "
 raw-x2-Comfortaa-Regular Comfortaa <comfortaa-x2.enc <Comfortaa-Regular.pfb " fontinst-autoenc-x2 ReEncodeFont "
 raw-x2-Comfortaa-Regular-Slanted Comfortaa <comfortaa-x2.enc <Comfortaa-Regular.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
 raw-x2-Comfortaa-Bold Comfortaa-Bold <comfortaa-x2.enc <Comfortaa-Bold.pfb " fontinst-autoenc-x2 ReEncodeFont "
 raw-x2-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-x2.enc <Comfortaa-Bold.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
-raw-x2-Comfortaa-Thin Comfortaa-Thin <comfortaa-x2.enc <Comfortaa-Thin.pfb " fontinst-autoenc-x2 ReEncodeFont "
-raw-x2-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-x2.enc <Comfortaa-Thin.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
+raw-x2-Comfortaa-Light Comfortaa-Light <comfortaa-x2.enc <Comfortaa-Light.pfb " fontinst-autoenc-x2 ReEncodeFont "
+raw-x2-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-x2.enc <Comfortaa-Light.pfb " fontinst-autoenc-x2 ReEncodeFont 0.167 SlantFont "
 raw-fixgreek-Comfortaa-Regular Comfortaa <comfortaa-fixgreek.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
 raw-lgr-Comfortaa-Regular Comfortaa <comfortaa-lgr.enc <Comfortaa-Regular.pfb " fontinst-autoenc-lgr ReEncodeFont "
 raw-fixgreek-Comfortaa-Regular-Slanted Comfortaa <comfortaa-fixgreek.enc <Comfortaa-Regular.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
@@ -72,7 +72,7 @@ raw-fixgreek-Comfortaa-Bold Comfortaa-Bold <comfortaa-fixgreek.enc <Comfortaa-Bo
 raw-lgr-Comfortaa-Bold Comfortaa-Bold <comfortaa-lgr.enc <Comfortaa-Bold.pfb " fontinst-autoenc-lgr ReEncodeFont "
 raw-fixgreek-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-fixgreek.enc <Comfortaa-Bold.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
 raw-lgr-Comfortaa-Bold-Slanted Comfortaa-Bold <comfortaa-lgr.enc <Comfortaa-Bold.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
-raw-fixgreek-Comfortaa-Thin Comfortaa-Thin <comfortaa-fixgreek.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
-raw-lgr-Comfortaa-Thin Comfortaa-Thin <comfortaa-lgr.enc <Comfortaa-Thin.pfb " fontinst-autoenc-lgr ReEncodeFont "
-raw-fixgreek-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-fixgreek.enc <Comfortaa-Thin.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
-raw-lgr-Comfortaa-Thin-Slanted Comfortaa-Thin <comfortaa-lgr.enc <Comfortaa-Thin.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
+raw-fixgreek-Comfortaa-Light Comfortaa-Light <comfortaa-fixgreek.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont "
+raw-lgr-Comfortaa-Light Comfortaa-Light <comfortaa-lgr.enc <Comfortaa-Light.pfb " fontinst-autoenc-lgr ReEncodeFont "
+raw-fixgreek-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-fixgreek.enc <Comfortaa-Light.pfb " fontinst-autoenc-comfortaa-fixgreek ReEncodeFont 0.167 SlantFont "
+raw-lgr-Comfortaa-Light-Slanted Comfortaa-Light <comfortaa-lgr.enc <Comfortaa-Light.pfb " fontinst-autoenc-lgr ReEncodeFont 0.167 SlantFont "
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
index f3419c9155e..f3419c9155e 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
index 4c0f71ff15a..4c0f71ff15a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
index 014fe0ace6a..014fe0ace6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
index 5c8d5a6c141..5c8d5a6c141 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/lgr-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm
index 6542dfdb63d..6542dfdb63d 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm
index 8d679021382..8d679021382 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm
index c2a1fc5a8b0..c2a1fc5a8b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm
index c7af11acac8..c7af11acac8 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ot1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm
index 1ea99a3bf2b..1ea99a3bf2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm
index 49fa818ac29..49fa818ac29 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-dotlessj-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
index 8a0327c1b4f..8a0327c1b4f 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
index 2e35d3dcd0a..2e35d3dcd0a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixcyrillic-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
index f86c683cf28..f86c683cf28 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
index 4e6bb8cb6f9..4e6bb8cb6f9 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixgreek-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
index 9d0d85ca272..9d0d85ca272 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
index b5b6352d8f0..b5b6352d8f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixlatin-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
index c8886cae54b..c8886cae54b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
index 65a51317518..65a51317518 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-fixtextcomp-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
index cf6487a8421..cf6487a8421 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
index 6130d706dc6..6130d706dc6 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-lgr-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
index c53a9551611..c53a9551611 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
index c514c7dd5b8..c514c7dd5b8 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ot1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
index 39fc7485846..39fc7485846 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
index 2a6687cd54e..2a6687cd54e 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
index 94006c0176b..94006c0176b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
index 38763e53f88..38763e53f88 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2a-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
index 94006c0176b..94006c0176b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
index 38763e53f88..38763e53f88 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2b-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
index 94006c0176b..94006c0176b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
index 38763e53f88..38763e53f88 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-t2c-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
index 0f85ad85e3b..0f85ad85e3b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
index e9ff8d173fb..e9ff8d173fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-ts1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
index 597275e510a..597275e510a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
index 1b5a411d7d0..1b5a411d7d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/raw-x2-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm
index f7f55573778..f7f55573778 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm
index 2a35a7d4e66..2a35a7d4e66 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm
index 990080c737a..990080c737a 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm
index ab36d534009..ab36d534009 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
index 8b763e90051..8b763e90051 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
index 5520bca2784..5520bca2784 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
index da4562719b9..da4562719b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
index c041ee5a05e..c041ee5a05e 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2a-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
index e9bcee8b159..e9bcee8b159 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
index fdfeaa166e7..fdfeaa166e7 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
index 3dd627b0350..3dd627b0350 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
index 7d5472dd322..7d5472dd322 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2b-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
index 50f90d7c600..50f90d7c600 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
index 3e3fd988729..3e3fd988729 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
index 3e18c8430cb..3e18c8430cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
index 93f13b331a7..93f13b331a7 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/t2c-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
index 10b7eec6091..10b7eec6091 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
index 1a1db3458af..1a1db3458af 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/ts1-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
index 95a115af796..95a115af796 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
index 22e45b56d11..22e45b56d11 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-Slanted.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-Slanted.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
index a4d2e3c9d0b..a4d2e3c9d0b 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light-SmallCaps.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin.tfm b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
index 8359bde2004..8359bde2004 100644
--- a/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Thin.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/comfortaa/x2-Comfortaa-Light.tfm
diff --git a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
index 3edb41f452d..15e888f674c 100644
--- a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Thin.ttf b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
index c925749f139..43f8a84e9f3 100644
--- a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Thin.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
diff --git a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
index e77425dbec0..c70afb63ef2 100644
--- a/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
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 b9ab0df6750..620ea735c7c 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 951a3f473a0..1e71c5d0c04 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-Thin-LCDFJ.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
index 719da02f7d1..423545f54b0 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Thin-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-Thin.pfb b/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Light.pfb
index 565cf6dff97..11033b8ea58 100644
--- a/Master/texmf-dist/fonts/type1/public/comfortaa/Comfortaa-Thin.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 907fc38ab5f..1dfdc70b5a3 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 818255f8c50..4c633870dbe 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/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
index bf11f36deb7..9d845fec27f 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
index e075913a348..1e1ceb995f6 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
index 5cab456db62..2b4916c742b 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
index 8b68fe97bd3..2567465f7e5 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/lgr-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
index 446a22c0db5..fc5948b0b32 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
index 810fa7edc02..20d32bfcbf2 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
index 4b84abb9c9f..05cff2fe0af 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
index 06044c46ece..9aaa2568c6b 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ot1-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
index 437d4707aef..af809734d30 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
index e034c24d109..9e42a8af9af 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
index e295f5d5b6f..a10931d77ee 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
index ce32d110b80..e928fedf3c8 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t1-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
index bf89ed0b11c..91c35d635af 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
index 1be7812787b..9c39f63f867 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
index abcbf6315a7..eeb564dc434 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
index 0f67af10f25..722760cd3e9 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2a-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
index b008ab7cf36..ea26dc974b9 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
index e69c7420b82..702d4b09ebd 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
index 8390aea4e02..f89d42cc685 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
index de19b33509c..14593e10769 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2b-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
index 36f3d0f0004..e2a3b5147c6 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
index 44ecac68117..2a23c014f64 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
index 087060b734f..0592831367f 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
index 8817e13389a..48ec5f0b30c 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/t2c-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
index 2ead7cc8d05..2c86098c0c5 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
index f482476798a..ddf59ace114 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/ts1-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
index bd96bbd4beb..2047e87cb6f 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
index 304e8f0edac..bc6a152a914 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-Slanted.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-Slanted.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
index 5a4a40824c4..37a4ff426d1 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin-SmallCaps.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light-SmallCaps.vf
diff --git a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin.vf b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
index 21fc8a9776a..f9a47ad4e39 100644
--- a/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Thin.vf
+++ b/Master/texmf-dist/fonts/vf/public/comfortaa/x2-Comfortaa-Light.vf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/CHANGES b/Master/texmf-dist/source/comfortaa/CHANGES
index 9078da0396a..ff4bfec15e3 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/CHANGES
+++ b/Master/texmf-dist/source/comfortaa/CHANGES
@@ -6,3 +6,8 @@ Changelog for version 1.2:
 
 Changelog for version 1.3:
 	- fix comfortaa-fixglyphs.mtx
+
+Changelog for version 1.4:
+	- remove "light" class option
+	- fix documentation
+	- add samples PDF
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/Makefile b/Master/texmf-dist/source/comfortaa/Makefile
index 8f587b25213..fa853b8f7dd 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/Makefile
+++ b/Master/texmf-dist/source/comfortaa/Makefile
@@ -1,5 +1,5 @@
 ## Makefile
-## 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)
@@ -63,7 +63,7 @@ MTX_FILES = $(FONT_NAME)-fixglyphs.mtx
 
 STYLE_FILES = $(wildcard *.sty)
 
-DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf CHANGES README
+DOCUMENTATION = $(FONT_NAME).tex $(FONT_NAME).pdf $(FONT_NAME)-samples.tex $(FONT_NAME)-samples.pdf CHANGES README
 
 # Files to be installed in texmf/source
 BUILD_FILES = $(FONTINST_FILE) $(FONTINST_REGLYPH_FILE) $(FONTINST_MAP_FILE) $(ETX_FILES) $(MTX_FILES) Makefile ttf2type1.pe $(DOCUMENTATION)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/README.comfortaa b/Master/texmf-dist/source/comfortaa/README
index 50b97906fc6..795f15ac79d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/README.comfortaa
+++ b/Master/texmf-dist/source/comfortaa/README
@@ -1,5 +1,5 @@
 ------------------------
- Comfortaa, version 1.3
+ Comfortaa, version 1.4
 ------------------------
 
 Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-dotlessj.etx b/Master/texmf-dist/source/comfortaa/comfortaa-dotlessj.etx
index ef6bf6debb6..fd0c0750ed2 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-dotlessj.etx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-dotlessj.etx
@@ -1,5 +1,5 @@
 %% comfortaa-dotlessj.etx
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-drv.tex b/Master/texmf-dist/source/comfortaa/comfortaa-drv.tex
index a8b1613a843..31b6b0d1fbf 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-drv.tex
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-drv.tex
@@ -1,5 +1,5 @@
 %% comfortaa-drv.tex
-%% 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)
@@ -30,8 +30,8 @@
   \transformfont{raw-\str{encoding}-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Regular}}}
   \transformfont{raw-\str{encoding}-Comfortaa-Bold}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Bold}}}
   \transformfont{raw-\str{encoding}-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Thin}}}
+  \transformfont{raw-\str{encoding}-Comfortaa-Light}{\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Light}}}
+  \transformfont{raw-\str{encoding}-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{\str{encoding}}{\fromafm{Comfortaa-Light}}}
 \endfor(encoding)
 
 \foreach(encoding){fixlatin,fixtextcomp,fixcyrillic,fixgreek}
@@ -39,16 +39,16 @@
   \transformfont{raw-\str{encoding}-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Regular}}}
   \transformfont{raw-\str{encoding}-Comfortaa-Bold}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Bold}}}
   \transformfont{raw-\str{encoding}-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Bold}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Thin}}}
-  \transformfont{raw-\str{encoding}-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Thin}}}
+  \transformfont{raw-\str{encoding}-Comfortaa-Light}{\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Light}}}
+  \transformfont{raw-\str{encoding}-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-\str{encoding}}{\fromafm{Comfortaa-Light}}}
 \endfor(encoding)
 
 \transformfont{raw-dotlessj-Comfortaa-Regular}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
 \transformfont{raw-dotlessj-Comfortaa-Regular-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Regular-LCDFJ}}}
 \transformfont{raw-dotlessj-Comfortaa-Bold}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
 \transformfont{raw-dotlessj-Comfortaa-Bold-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Bold-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Thin}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Thin-LCDFJ}}}
-\transformfont{raw-dotlessj-Comfortaa-Thin-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Thin-LCDFJ}}}
+\transformfont{raw-dotlessj-Comfortaa-Light}{\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
+\transformfont{raw-dotlessj-Comfortaa-Light-Slanted}{\slantfont{\int{slant}}\reencodefont{comfortaa-dotlessj}{\fromafm{Comfortaa-Light-LCDFJ}}}
 
 \input comfortaa-reglyph
 
@@ -98,7 +98,6 @@
 }
 \normalcc
 
-
 \installfonts
 \installfamily{OT1}{fco}{}
 
@@ -112,10 +111,10 @@
 \installfont{ot1-Comfortaa-Bold-SmallCaps}{ot1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{ot1-Comfortaa-Bold-Slanted-SmallCaps}{ot1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{ot1-Comfortaa-Thin}{ot1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-Slanted}{ot1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-SmallCaps}{ot1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{ot1-Comfortaa-Thin-Slanted-SmallCaps}{ot1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{ot1-Comfortaa-Light}{ot1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{ot1-Comfortaa-Light-Slanted}{ot1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{ot1}{OT1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{ot1-Comfortaa-Light-SmallCaps}{ot1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{ot1-Comfortaa-Light-Slanted-SmallCaps}{ot1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{ot1c}{OT1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -132,10 +131,10 @@
 \installfont{t1-Comfortaa-Bold-SmallCaps}{t1-Comfortaa-Bold,fixlatin-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{t1-Comfortaa-Bold-Slanted-SmallCaps}{t1-Comfortaa-Bold-Slanted,fixlatin-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{t1-Comfortaa-Thin}{t1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-Slanted}{t1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-SmallCaps}{t1-Comfortaa-Thin,fixlatin-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t1-Comfortaa-Thin-Slanted-SmallCaps}{t1-Comfortaa-Thin-Slanted,fixlatin-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{t1-Comfortaa-Light}{t1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{t1-Comfortaa-Light-Slanted}{t1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{t1}{T1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{t1-Comfortaa-Light-SmallCaps}{t1-Comfortaa-Light,fixlatin-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{t1-Comfortaa-Light-Slanted-SmallCaps}{t1-Comfortaa-Light-Slanted,fixlatin-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin}{t1c}{T1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -152,10 +151,10 @@
 \installfontas{ts1-Comfortaa-Bold}{TS1}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfontas{ts1-Comfortaa-Bold-Slanted}{TS1}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{ts1-Comfortaa-Thin}{ts1-Comfortaa-Thin,fixtextcomp-Comfortaa-Thin,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{ts1-Comfortaa-Thin-Slanted}{ts1-Comfortaa-Thin-Slanted,fixtextcomp-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Thin}{TS1}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfontas{ts1-Comfortaa-Thin-Slanted}{TS1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{ts1-Comfortaa-Light}{ts1-Comfortaa-Light,fixtextcomp-Comfortaa-Light,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{ts1-Comfortaa-Light-Slanted}{ts1-Comfortaa-Light-Slanted,fixtextcomp-Comfortaa-Light-Slanted,comfortaa-fixglyphs,textcomp}{ts1}{TS1}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfontas{ts1-Comfortaa-Light}{TS1}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfontas{ts1-Comfortaa-Light-Slanted}{TS1}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -172,10 +171,10 @@
 \installfont{t2a-Comfortaa-Bold-SmallCaps}{t2a-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{t2a-Comfortaa-Bold-Slanted-SmallCaps}{t2a-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{t2a-Comfortaa-Thin}{t2a-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-Slanted}{t2a-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-SmallCaps}{t2a-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2a-Comfortaa-Thin-Slanted-SmallCaps}{t2a-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{t2a-Comfortaa-Light}{t2a-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{t2a-Comfortaa-Light-Slanted}{t2a-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2a}{T2A}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{t2a-Comfortaa-Light-SmallCaps}{t2a-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{t2a-Comfortaa-Light-Slanted-SmallCaps}{t2a-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2ac}{T2A}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -192,10 +191,10 @@
 \installfont{t2b-Comfortaa-Bold-SmallCaps}{t2b-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{t2b-Comfortaa-Bold-Slanted-SmallCaps}{t2b-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{t2b-Comfortaa-Thin}{t2b-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-Slanted}{t2b-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-SmallCaps}{t2b-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2b-Comfortaa-Thin-Slanted-SmallCaps}{t2b-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{t2b-Comfortaa-Light}{t2b-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{t2b-Comfortaa-Light-Slanted}{t2b-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2b}{T2B}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{t2b-Comfortaa-Light-SmallCaps}{t2b-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{t2b-Comfortaa-Light-Slanted-SmallCaps}{t2b-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2bc}{T2B}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -212,10 +211,10 @@
 \installfont{t2c-Comfortaa-Bold-SmallCaps}{t2c-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{t2c-Comfortaa-Bold-Slanted-SmallCaps}{t2c-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{t2c-Comfortaa-Thin}{t2c-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-Slanted}{t2c-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-SmallCaps}{t2c-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{t2c-Comfortaa-Thin-Slanted-SmallCaps}{t2c-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{t2c-Comfortaa-Light}{t2c-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{t2c-Comfortaa-Light-Slanted}{t2c-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2c}{T2C}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{t2c-Comfortaa-Light-SmallCaps}{t2c-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{t2c-Comfortaa-Light-Slanted-SmallCaps}{t2c-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{t2cc}{T2C}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -232,10 +231,10 @@
 \installfont{x2-Comfortaa-Bold-SmallCaps}{x2-Comfortaa-Bold,fixcyrillic-Comfortaa-Bold,dotlessj-Comfortaa-Bold,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{x2-Comfortaa-Bold-Slanted-SmallCaps}{x2-Comfortaa-Bold-Slanted,fixcyrillic-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{x2-Comfortaa-Thin}{x2-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-Slanted}{x2-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-SmallCaps}{x2-Comfortaa-Thin,fixcyrillic-Comfortaa-Thin,dotlessj-Comfortaa-Thin,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{x2-Comfortaa-Thin-Slanted-SmallCaps}{x2-Comfortaa-Thin-Slanted,fixcyrillic-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{x2-Comfortaa-Light}{x2-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{x2-Comfortaa-Light-Slanted}{x2-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2}{X2}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{x2-Comfortaa-Light-SmallCaps}{x2-Comfortaa-Light,fixcyrillic-Comfortaa-Light,dotlessj-Comfortaa-Light,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{x2-Comfortaa-Light-Slanted-SmallCaps}{x2-Comfortaa-Light-Slanted,fixcyrillic-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,comfortaa-fixglyphs,newlatin,cyrillic}{x2c}{X2}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
@@ -252,10 +251,10 @@
 \installfont{lgr-Comfortaa-Bold-SmallCaps}{lgr-Comfortaa-Bold,fixgreek-Comfortaa-Bold,newlatin,greek}{lgrc}{LGR}{fco}{b}{sc}{<->\string\comfortaa@scale}
 \installfont{lgr-Comfortaa-Bold-Slanted-SmallCaps}{lgr-Comfortaa-Bold-Slanted,fixgreek-Comfortaa-Bold-Slanted,dotlessj-Comfortaa-Bold-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{b}{scsl}{<->\string\comfortaa@scale}
 
-\installfont{lgr-Comfortaa-Thin}{lgr-Comfortaa-Thin,fixgreek-Comfortaa-Thin,newlatin,greek}{lgr}{LGR}{fco}{l}{n}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-Slanted}{lgr-Comfortaa-Thin-Slanted,fixgreek-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,newlatin,greek}{lgr}{LGR}{fco}{l}{sl}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-SmallCaps}{lgr-Comfortaa-Thin,fixgreek-Comfortaa-Thin,newlatin,greek}{lgrc}{LGR}{fco}{l}{sc}{<->\string\comfortaa@scale}
-\installfont{lgr-Comfortaa-Thin-Slanted-SmallCaps}{lgr-Comfortaa-Thin-Slanted,fixgreek-Comfortaa-Thin-Slanted,dotlessj-Comfortaa-Thin-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{l}{scsl}{<->\string\comfortaa@scale}
+\installfont{lgr-Comfortaa-Light}{lgr-Comfortaa-Light,fixgreek-Comfortaa-Light,newlatin,greek}{lgr}{LGR}{fco}{l}{n}{<->\string\comfortaa@scale}
+\installfont{lgr-Comfortaa-Light-Slanted}{lgr-Comfortaa-Light-Slanted,fixgreek-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,newlatin,greek}{lgr}{LGR}{fco}{l}{sl}{<->\string\comfortaa@scale}
+\installfont{lgr-Comfortaa-Light-SmallCaps}{lgr-Comfortaa-Light,fixgreek-Comfortaa-Light,newlatin,greek}{lgrc}{LGR}{fco}{l}{sc}{<->\string\comfortaa@scale}
+\installfont{lgr-Comfortaa-Light-Slanted-SmallCaps}{lgr-Comfortaa-Light-Slanted,fixgreek-Comfortaa-Light-Slanted,dotlessj-Comfortaa-Light-Slanted,newlatin,greek}{lgrc}{LGR}{fco}{l}{scsl}{<->\string\comfortaa@scale}
 \endinstallfonts
 
 
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixcyrillic.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixcyrillic.etx
index dba86b6d9ab..78267648a6d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixcyrillic.etx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-fixcyrillic.etx
@@ -1,5 +1,5 @@
 %% comfortaa-fixcyrillic.etx
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixglyphs.mtx b/Master/texmf-dist/source/comfortaa/comfortaa-fixglyphs.mtx
index 63d44cdb762..63d44cdb762 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixglyphs.mtx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-fixglyphs.mtx
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixgreek.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixgreek.etx
index 88e84354926..f6d6b30bf26 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixgreek.etx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-fixgreek.etx
@@ -1,5 +1,5 @@
 %% comfortaa-fixgreek.etx
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixlatin.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixlatin.etx
index bd59c24e514..b936132ba1a 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixlatin.etx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-fixlatin.etx
@@ -1,5 +1,5 @@
 %% comfortaa-fixlatin.etx
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixtextcomp.etx b/Master/texmf-dist/source/comfortaa/comfortaa-fixtextcomp.etx
index d6537f9d758..02365466b4d 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-fixtextcomp.etx
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-fixtextcomp.etx
@@ -1,5 +1,5 @@
 %% comfortaa-fixtextcomp.etx
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-map.tex b/Master/texmf-dist/source/comfortaa/comfortaa-map.tex
index 9f00765bf25..eec96437360 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-map.tex
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-map.tex
@@ -1,5 +1,5 @@
 %% comfortaa-map.tex
-%% 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)
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-reglyph.tex b/Master/texmf-dist/source/comfortaa/comfortaa-reglyph.tex
index 5d154705987..1ac910713db 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/comfortaa-reglyph.tex
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-reglyph.tex
@@ -1,5 +1,5 @@
 %% comfortaa-reglyph.tex
-%% 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)
@@ -25,8 +25,8 @@
   \reglyphfont{ot1-Comfortaa-Regular-Slanted}{raw-ot1-Comfortaa-Regular-Slanted}
   \reglyphfont{ot1-Comfortaa-Bold}{raw-ot1-Comfortaa-Bold}
   \reglyphfont{ot1-Comfortaa-Bold-Slanted}{raw-ot1-Comfortaa-Bold-Slanted}
-  \reglyphfont{ot1-Comfortaa-Thin}{raw-ot1-Comfortaa-Thin}
-  \reglyphfont{ot1-Comfortaa-Thin-Slanted}{raw-ot1-Comfortaa-Thin-Slanted}
+  \reglyphfont{ot1-Comfortaa-Light}{raw-ot1-Comfortaa-Light}
+  \reglyphfont{ot1-Comfortaa-Light-Slanted}{raw-ot1-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -37,8 +37,8 @@
   \reglyphfont{t1-Comfortaa-Regular-Slanted}{raw-t1-Comfortaa-Regular-Slanted}
   \reglyphfont{t1-Comfortaa-Bold}{raw-t1-Comfortaa-Bold}
   \reglyphfont{t1-Comfortaa-Bold-Slanted}{raw-t1-Comfortaa-Bold-Slanted}
-  \reglyphfont{t1-Comfortaa-Thin}{raw-t1-Comfortaa-Thin}
-  \reglyphfont{t1-Comfortaa-Thin-Slanted}{raw-t1-Comfortaa-Thin-Slanted}
+  \reglyphfont{t1-Comfortaa-Light}{raw-t1-Comfortaa-Light}
+  \reglyphfont{t1-Comfortaa-Light-Slanted}{raw-t1-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -56,8 +56,8 @@
   \reglyphfont{fixlatin-Comfortaa-Regular-Slanted}{raw-fixlatin-Comfortaa-Regular-Slanted}
   \reglyphfont{fixlatin-Comfortaa-Bold}{raw-fixlatin-Comfortaa-Bold}
   \reglyphfont{fixlatin-Comfortaa-Bold-Slanted}{raw-fixlatin-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixlatin-Comfortaa-Thin}{raw-fixlatin-Comfortaa-Thin}
-  \reglyphfont{fixlatin-Comfortaa-Thin-Slanted}{raw-fixlatin-Comfortaa-Thin-Slanted}
+  \reglyphfont{fixlatin-Comfortaa-Light}{raw-fixlatin-Comfortaa-Light}
+  \reglyphfont{fixlatin-Comfortaa-Light-Slanted}{raw-fixlatin-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -66,8 +66,8 @@
   \reglyphfont{ts1-Comfortaa-Regular-Slanted}{raw-ts1-Comfortaa-Regular-Slanted}
   \reglyphfont{ts1-Comfortaa-Bold}{raw-ts1-Comfortaa-Bold}
   \reglyphfont{ts1-Comfortaa-Bold-Slanted}{raw-ts1-Comfortaa-Bold-Slanted}
-  \reglyphfont{ts1-Comfortaa-Thin}{raw-ts1-Comfortaa-Thin}
-  \reglyphfont{ts1-Comfortaa-Thin-Slanted}{raw-ts1-Comfortaa-Thin-Slanted}
+  \reglyphfont{ts1-Comfortaa-Light}{raw-ts1-Comfortaa-Light}
+  \reglyphfont{ts1-Comfortaa-Light-Slanted}{raw-ts1-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -82,8 +82,8 @@
   \reglyphfont{fixtextcomp-Comfortaa-Regular-Slanted}{raw-fixtextcomp-Comfortaa-Regular-Slanted}
   \reglyphfont{fixtextcomp-Comfortaa-Bold}{raw-fixtextcomp-Comfortaa-Bold}
   \reglyphfont{fixtextcomp-Comfortaa-Bold-Slanted}{raw-fixtextcomp-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixtextcomp-Comfortaa-Thin}{raw-fixtextcomp-Comfortaa-Thin}
-  \reglyphfont{fixtextcomp-Comfortaa-Thin-Slanted}{raw-fixtextcomp-Comfortaa-Thin-Slanted}
+  \reglyphfont{fixtextcomp-Comfortaa-Light}{raw-fixtextcomp-Comfortaa-Light}
+  \reglyphfont{fixtextcomp-Comfortaa-Light-Slanted}{raw-fixtextcomp-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -94,8 +94,8 @@
   \reglyphfont{t2a-Comfortaa-Regular-Slanted}{raw-t2a-Comfortaa-Regular-Slanted}
   \reglyphfont{t2a-Comfortaa-Bold}{raw-t2a-Comfortaa-Bold}
   \reglyphfont{t2a-Comfortaa-Bold-Slanted}{raw-t2a-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2a-Comfortaa-Thin}{raw-t2a-Comfortaa-Thin}
-  \reglyphfont{t2a-Comfortaa-Thin-Slanted}{raw-t2a-Comfortaa-Thin-Slanted}
+  \reglyphfont{t2a-Comfortaa-Light}{raw-t2a-Comfortaa-Light}
+  \reglyphfont{t2a-Comfortaa-Light-Slanted}{raw-t2a-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 \reglyphfonts
@@ -105,8 +105,8 @@
   \reglyphfont{t2b-Comfortaa-Regular-Slanted}{raw-t2b-Comfortaa-Regular-Slanted}
   \reglyphfont{t2b-Comfortaa-Bold}{raw-t2b-Comfortaa-Bold}
   \reglyphfont{t2b-Comfortaa-Bold-Slanted}{raw-t2b-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2b-Comfortaa-Thin}{raw-t2b-Comfortaa-Thin}
-  \reglyphfont{t2b-Comfortaa-Thin-Slanted}{raw-t2b-Comfortaa-Thin-Slanted}
+  \reglyphfont{t2b-Comfortaa-Light}{raw-t2b-Comfortaa-Light}
+  \reglyphfont{t2b-Comfortaa-Light-Slanted}{raw-t2b-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 \reglyphfonts
@@ -116,8 +116,8 @@
   \reglyphfont{t2c-Comfortaa-Regular-Slanted}{raw-t2c-Comfortaa-Regular-Slanted}
   \reglyphfont{t2c-Comfortaa-Bold}{raw-t2c-Comfortaa-Bold}
   \reglyphfont{t2c-Comfortaa-Bold-Slanted}{raw-t2c-Comfortaa-Bold-Slanted}
-  \reglyphfont{t2c-Comfortaa-Thin}{raw-t2c-Comfortaa-Thin}
-  \reglyphfont{t2c-Comfortaa-Thin-Slanted}{raw-t2c-Comfortaa-Thin-Slanted}
+  \reglyphfont{t2c-Comfortaa-Light}{raw-t2c-Comfortaa-Light}
+  \reglyphfont{t2c-Comfortaa-Light-Slanted}{raw-t2c-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 \reglyphfonts
@@ -127,8 +127,8 @@
   \reglyphfont{x2-Comfortaa-Regular-Slanted}{raw-x2-Comfortaa-Regular-Slanted}
   \reglyphfont{x2-Comfortaa-Bold}{raw-x2-Comfortaa-Bold}
   \reglyphfont{x2-Comfortaa-Bold-Slanted}{raw-x2-Comfortaa-Bold-Slanted}
-  \reglyphfont{x2-Comfortaa-Thin}{raw-x2-Comfortaa-Thin}
-  \reglyphfont{x2-Comfortaa-Thin-Slanted}{raw-x2-Comfortaa-Thin-Slanted}
+  \reglyphfont{x2-Comfortaa-Light}{raw-x2-Comfortaa-Light}
+  \reglyphfont{x2-Comfortaa-Light-Slanted}{raw-x2-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 \reglyphfonts
@@ -255,8 +255,8 @@
   \reglyphfont{fixcyrillic-Comfortaa-Regular-Slanted}{raw-fixcyrillic-Comfortaa-Regular-Slanted}
   \reglyphfont{fixcyrillic-Comfortaa-Bold}{raw-fixcyrillic-Comfortaa-Bold}
   \reglyphfont{fixcyrillic-Comfortaa-Bold-Slanted}{raw-fixcyrillic-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixcyrillic-Comfortaa-Thin}{raw-fixcyrillic-Comfortaa-Thin}
-  \reglyphfont{fixcyrillic-Comfortaa-Thin-Slanted}{raw-fixcyrillic-Comfortaa-Thin-Slanted}
+  \reglyphfont{fixcyrillic-Comfortaa-Light}{raw-fixcyrillic-Comfortaa-Light}
+  \reglyphfont{fixcyrillic-Comfortaa-Light-Slanted}{raw-fixcyrillic-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -269,8 +269,8 @@
   \reglyphfont{lgr-Comfortaa-Regular-Slanted}{raw-lgr-Comfortaa-Regular-Slanted}
   \reglyphfont{lgr-Comfortaa-Bold}{raw-lgr-Comfortaa-Bold}
   \reglyphfont{lgr-Comfortaa-Bold-Slanted}{raw-lgr-Comfortaa-Bold-Slanted}
-  \reglyphfont{lgr-Comfortaa-Thin}{raw-lgr-Comfortaa-Thin}
-  \reglyphfont{lgr-Comfortaa-Thin-Slanted}{raw-lgr-Comfortaa-Thin-Slanted}
+  \reglyphfont{lgr-Comfortaa-Light}{raw-lgr-Comfortaa-Light}
+  \reglyphfont{lgr-Comfortaa-Light-Slanted}{raw-lgr-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 \reglyphfonts
@@ -284,8 +284,8 @@
   \reglyphfont{fixgreek-Comfortaa-Regular-Slanted}{raw-fixgreek-Comfortaa-Regular-Slanted}
   \reglyphfont{fixgreek-Comfortaa-Bold}{raw-fixgreek-Comfortaa-Bold}
   \reglyphfont{fixgreek-Comfortaa-Bold-Slanted}{raw-fixgreek-Comfortaa-Bold-Slanted}
-  \reglyphfont{fixgreek-Comfortaa-Thin}{raw-fixgreek-Comfortaa-Thin}
-  \reglyphfont{fixgreek-Comfortaa-Thin-Slanted}{raw-fixgreek-Comfortaa-Thin-Slanted}
+  \reglyphfont{fixgreek-Comfortaa-Light}{raw-fixgreek-Comfortaa-Light}
+  \reglyphfont{fixgreek-Comfortaa-Light-Slanted}{raw-fixgreek-Comfortaa-Light-Slanted}
 \endreglyphfonts
 
 
@@ -296,6 +296,6 @@
   \reglyphfont{dotlessj-Comfortaa-Regular-Slanted}{raw-dotlessj-Comfortaa-Regular-Slanted}
   \reglyphfont{dotlessj-Comfortaa-Bold}{raw-dotlessj-Comfortaa-Bold}
   \reglyphfont{dotlessj-Comfortaa-Bold-Slanted}{raw-dotlessj-Comfortaa-Bold-Slanted}
-  \reglyphfont{dotlessj-Comfortaa-Thin}{raw-dotlessj-Comfortaa-Thin}
-  \reglyphfont{dotlessj-Comfortaa-Thin-Slanted}{raw-dotlessj-Comfortaa-Thin-Slanted}
+  \reglyphfont{dotlessj-Comfortaa-Light}{raw-dotlessj-Comfortaa-Light}
+  \reglyphfont{dotlessj-Comfortaa-Light-Slanted}{raw-dotlessj-Comfortaa-Light-Slanted}
 \endreglyphfonts
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf b/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf
new file mode 100644
index 00000000000..37bd2281926
--- /dev/null
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-samples.pdf
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex b/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex
new file mode 100644
index 00000000000..554a517dd17
--- /dev/null
+++ b/Master/texmf-dist/source/comfortaa/comfortaa-samples.tex
@@ -0,0 +1,89 @@
+%% comfortaa-samples.tex
+%% 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)
+% any later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+% distributions of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Mohamed El Morabity
+%
+% This work consists of all files listed in manifest.txt.
+
+\documentclass{article}
+
+\usepackage[greek,russian,francais,american]{babel}
+\usepackage{comfortaa}
+\usepackage[LGR,T2A,T1,OT1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage{microtype}
+\usepackage{textcomp}
+
+\newcommand{\latinSample}{%
+  \foreignlanguage{francais}{%
+    Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
+  }%
+}
+
+\newcommand{\cyrillicSample}{%
+  \foreignlanguage{russian}{%
+    Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
+  }%
+}
+
+\newcommand{\greekSample}{%
+  \foreignlanguage{greek}{%
+    'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
+  }%
+}
+
+\newcommand{\miscSample}{%
+  0123456789 fi fl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
+}
+
+\newcommand{\fontSample}[2]{%
+  {\usefont{T1}{fco}{#1}{#2} \latinSample}
+
+  {\usefont{T2A}{fco}{#1}{#2} \cyrillicSample}
+
+  {\usefont{LGR}{fco}{#1}{#2} \greekSample}%
+
+  {\fontfamily{fco}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
+}
+
+\begin{document}
+
+\section*{Comfortaa Regular}
+
+\fontSample{m}{n}
+
+\fontSample{m}{sl}
+
+\fontSample{m}{sc}
+
+\fontSample{m}{scsl}
+
+\section*{Comfortaa Bold}
+
+\fontSample{b}{n}
+
+\fontSample{b}{sl}
+
+\fontSample{b}{sc}
+
+\fontSample{b}{scsl}
+
+\section*{Comfortaa Light}
+
+\fontSample{l}{n}
+
+\fontSample{l}{sl}
+
+\fontSample{l}{sc}
+
+\fontSample{l}{scsl}
+
+\end{document}
diff --git a/Master/texmf-dist/source/comfortaa/comfortaa.pdf b/Master/texmf-dist/source/comfortaa/comfortaa.pdf
new file mode 100644
index 00000000000..2eeae2bc5bf
--- /dev/null
+++ b/Master/texmf-dist/source/comfortaa/comfortaa.pdf
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.tex b/Master/texmf-dist/source/comfortaa/comfortaa.tex
index 0325ad745fc..cf781b72937 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/source/comfortaa/comfortaa.tex
+++ b/Master/texmf-dist/source/comfortaa/comfortaa.tex
@@ -1,5 +1,5 @@
 %% comfortaa.tex
-%% 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)
@@ -39,7 +39,7 @@
 \newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
 \newcommand{\program}{}
 
-\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.3}
+\title{\LaTeX{} support for Comfortaa\\\relsize{-1}Version~1.4}
 
 \author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
 
@@ -87,10 +87,11 @@ work.
 \subsection{Calling Comfortaa}
 
 You can use the Comfortaa font in a \LaTeX{} document by adding the command
-\begin{verbatim} \usepackage{comfortaa}
+\begin{verbatim}
+\usepackage{comfortaa}
 \end{verbatim}
-to the preamble. The package supplies the
-\code{\char`\\fcofamily} command to switch the current font to Comfortaa.
+to the preamble.  The package supplies the \code{\char`\\fcofamily} command to
+switch the current font to Comfortaa.
 
 \subsubsection{Options}
 
@@ -106,20 +107,6 @@ To set Comfortaa as default sans-serif only:
 \usepackage[defaultsans]{comfortaa}
 \end{verbatim}
 
-\paragraph{Default weight}
-
-The following options specify which weight of the font you prefer to use:
-\begin{center}
-  \begin{tabular}{ll}
-    \toprule
-    \code{regular}&{\fcofamily\fontseries{m}\selectfont use regular face}\\
-    \midrule
-    \code{light}&{\fcofamily\fontseries{l}\selectfont use light face}\\
-    \bottomrule
-  \end{tabular}
-\end{center}
-The \code{regular} option is enabled by default.
-
 \paragraph{Font scaling}
 
 The font can be up- and downscaled by any factor. This can be used to make
@@ -130,7 +117,6 @@ the font according to \parameter{ratio} (1.0 by default), for example:
 \usepackage[scale=0.95]{comfortaa}
 \end{verbatim}
 
-
 \subsection{Encodings}
 
 The following encodings are supported:
@@ -156,9 +142,9 @@ treated poorly, if at all. Note difference in kerning between e.g.
 \begin{center}
   \begin{tabular}{ll}
     \toprule
-    OT1-encoded&To Ta Té\\
+    OT1-encoded&{\fcofamily To Ta Té}\\
     \midrule
-    T1-encoded&\fontencoding{T1}\selectfont To Ta Té\\
+    T1-encoded&{\fcofamily\fontencoding{T1}\selectfont To Ta Té}\\
     \bottomrule
   \end{tabular}
 \end{center}
diff --git a/Master/texmf-dist/doc/fonts/comfortaa/ttf2type1.pe b/Master/texmf-dist/source/comfortaa/ttf2type1.pe
index 4c71df2b326..0719858b891 100644
--- a/Master/texmf-dist/doc/fonts/comfortaa/ttf2type1.pe
+++ b/Master/texmf-dist/source/comfortaa/ttf2type1.pe
@@ -1,6 +1,6 @@
 #!/usr/bin/env fontforge
 ## ttf2ype1.pe
-## 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)
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}{}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f7ef3f8848f..bb78ea1f301 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -205,7 +205,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cmcyralt',		"die 'skipping, license noinfo",
  'cntdwn',		"die 'skipping, author (dps) request",
  'comicsans',		"die 'skipping, Comic Sans is nonfree'",
- 'comfortaa',		"&MAKEflatten",
+ 'comfortaa',		"&MAKEcopy",
  'compact',		"die 'skipping, nonfree license'",
  'concmath-fonts',	"&MAKEflatten",
  'concmath',		"&MAKEnosymlinks",
@@ -881,6 +881,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'babelbib'             => '&POSTbabelbib',
  'biber'                => '&POSTbiber',
  'bibtex'               => '&POSTbibtex',
+ 'comfortaa'		=> '&POSTdroid',
  'context-games'        => '&POSTcontext_games',
  'coordsys'		=> '&POSTcoordsys',
  'ctex'			=> '&POSTctex',